Merge remote-tracking branch 'origin/feature_zhujian' into feature_zhujian

data-ui/src/views/data/housingconstruction/personnel/index.vue

@@ -137,7 +137,7 @@
 
     <!-- 添加或修改配送人员对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="1000px" class="form-style">
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+      <el-form ref="form" :model="form" :rules="rules" label-width="124px">
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="企业" prop="enterpriseId">
@@ -219,6 +219,38 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="劳动合同" prop="laborContract">
+              <ImageUpload ref="ImageUpload" :limit="1" :file-type="['png','jpg','jpeg']"
+                           :value="form.laborContract"
+                           @input="getLaborContract"></ImageUpload>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="社会保险证明" prop="insurance">
+              <ImageUpload ref="ImageUpload" :limit="1" :file-type="['png','jpg','jpeg']"
+                           :value="form.insurance"
+                           @input="getInsurance"></ImageUpload>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="培训考核合格证明" prop="assessment">
+              <ImageUpload ref="ImageUpload" :limit="1" :file-type="['png','jpg','jpeg']"
+                           :value="form.assessment"
+                           @input="getAssessment"></ImageUpload>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="送气服务证" prop="airCard">
+              <ImageUpload ref="ImageUpload" :limit="1" :file-type="['png','jpg','jpeg']"
+                           :value="form.airCard"
+                           @input="getAirCard"></ImageUpload>
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -336,6 +368,18 @@ export default {
       this.form.deptName = node.label
       this.$refs.form.validateField('deptId');
     },
+    getLaborContract(url) {
+      this.form.laborContract = url
+    },
+    getInsurance(url) {
+      this.form.insurance = url
+    },
+    getAssessment(url) {
+      this.form.assessment = url
+    },
+    getAirCard(url) {
+      this.form.airCard = url
+    },
     /** 查询配送人员列表 */
     getList() {
       this.loading = true;

data-ui/src/views/data/housingconstruction/steelcylinder/index.vue

@@ -91,7 +91,7 @@
           <dict-tag :options="dict.type.steelcylinder_state" :value="scope.row.state"/>
         </template>
       </el-table-column>
-      <el-table-column label="钢瓶阈值（月）" align="center" prop="threshold"/>
+      <el-table-column label="钢瓶阈值（天）" align="center" prop="threshold"/>
       <el-table-column label="所属部门" align="center" prop="deptName"/>
       <el-table-column label="创建人" align="center" prop="createName"/>
       <el-table-column label="创建时间" align="center" prop="createTime"/>
@@ -482,7 +482,6 @@ export default {
           {required: true, message: "气瓶状态不能为空", trigger: "blur"},
         ],
         threshold: [
-          {required: true, message: "钢瓶阈值不能为空", trigger: "blur"},
           {validator: checkPositiveInteger, trigger: 'blur'}
         ],
         deptId: [

src/main/java/com/sooka/sponest/data/housingconstruction/domain/CenterdataTHousingconstructionDeliveryPersonnel.java

@@ -94,6 +94,50 @@ public class CenterdataTHousingconstructionDeliveryPersonnel extends BaseBusines
     @Excel(name = "行政区域")
     private String area;
 
+    //劳动合同
+    private String laborContract;
+
+    //社会保险证明
+    private String insurance;
+
+    //培训考核合格证明
+    private String assessment;
+
+    //送气服务证
+    private String airCard;
+
+    public String getLaborContract() {
+        return laborContract;
+    }
+
+    public void setLaborContract(String laborContract) {
+        this.laborContract = laborContract;
+    }
+
+    public String getInsurance() {
+        return insurance;
+    }
+
+    public void setInsurance(String insurance) {
+        this.insurance = insurance;
+    }
+
+    public String getAssessment() {
+        return assessment;
+    }
+
+    public void setAssessment(String assessment) {
+        this.assessment = assessment;
+    }
+
+    public String getAirCard() {
+        return airCard;
+    }
+
+    public void setAirCard(String airCard) {
+        this.airCard = airCard;
+    }
+
     public void setId(String id) {
         this.id = id;
     }

src/main/java/com/sooka/sponest/data/housingconstruction/service/impl/CenterdataTHousingconstructionAttachServiceImpl.java

@@ -179,10 +179,9 @@ public class CenterdataTHousingconstructionAttachServiceImpl implements ICenterd
     @Override
     public Map<String, Object> getAttachToMap(String busId){
         List<CenterdataTHousingconstructionAttach> attachPathToEntityArray = getAttachPathToEntityArray(busId);
-        String fileUrl = SpringUtils.getBean(RemoteConfigService.class).remotegetConfigKey("fileUrl").getData();
         HashMap<String, Object> result = new HashMap<>();
         attachPathToEntityArray.forEach(attach->{
-            result.put(attach.getDictType(), fileUrl + attach.getAttachPath());
+            result.put(attach.getDictType(), attach.getAttachPath());
         });
         return result;
     }

src/main/java/com/sooka/sponest/data/housingconstruction/service/impl/CenterdataTHousingconstructionDeliveryPersonnelServiceImpl.java

@@ -1,17 +1,22 @@
 package com.sooka.sponest.data.housingconstruction.service.impl;
 
 import com.ruoyi.common.core.utils.DateUtils;
+import com.ruoyi.common.core.utils.StringUtils;
 import com.ruoyi.common.core.utils.uuid.IdUtils;
 import com.ruoyi.common.datascope.annotation.DataScopeMutiDept;
 import com.ruoyi.common.security.utils.SecurityUtils;
 import com.sooka.sponest.data.base.service.impl.BaseServiceImpl;
 import com.sooka.sponest.data.housingconstruction.domain.CenterdataTHousingconstructionDeliveryPersonnel;
 import com.sooka.sponest.data.housingconstruction.mapper.CenterdataTHousingconstructionDeliveryPersonnelMapper;
+import com.sooka.sponest.data.housingconstruction.service.ICenterdataTHousingconstructionAttachService;
 import com.sooka.sponest.data.housingconstruction.service.ICenterdataTHousingconstructionDeliveryPersonnelService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 配送人员Service业务层处理
@@ -24,6 +29,9 @@ public class CenterdataTHousingconstructionDeliveryPersonnelServiceImpl extends
     @Autowired
     private CenterdataTHousingconstructionDeliveryPersonnelMapper centerdataTHousingconstructionDeliveryPersonnelMapper;
 
+    @Autowired
+    private ICenterdataTHousingconstructionAttachService attachService;
+
     /**
      * 查询配送人员
      *
@@ -32,7 +40,23 @@ public class CenterdataTHousingconstructionDeliveryPersonnelServiceImpl extends
      */
     @Override
     public CenterdataTHousingconstructionDeliveryPersonnel selectCenterdataTHousingconstructionDeliveryPersonnelById(String id) {
-        return centerdataTHousingconstructionDeliveryPersonnelMapper.selectCenterdataTHousingconstructionDeliveryPersonnelById(id);
+        CenterdataTHousingconstructionDeliveryPersonnel deliveryPersonnel = centerdataTHousingconstructionDeliveryPersonnelMapper.selectCenterdataTHousingconstructionDeliveryPersonnelById(id);
+        Map<String, Object> attachToMap = attachService.getAttachToMap(id);
+        if (attachToMap != null) {
+            if (attachToMap.containsKey("laborContract")) {
+                deliveryPersonnel.setLaborContract(attachToMap.get("laborContract").toString());
+            }
+            if (attachToMap.containsKey("insurance")) {
+                deliveryPersonnel.setInsurance(attachToMap.get("insurance").toString());
+            }
+            if (attachToMap.containsKey("assessment")) {
+                deliveryPersonnel.setAssessment(attachToMap.get("assessment").toString());
+            }
+            if (attachToMap.containsKey("airCard")) {
+                deliveryPersonnel.setAirCard(attachToMap.get("airCard").toString());
+            }
+        }
+        return deliveryPersonnel;
     }
 
     /**
@@ -60,6 +84,7 @@ public class CenterdataTHousingconstructionDeliveryPersonnelServiceImpl extends
         centerdataTHousingconstructionDeliveryPersonnel.setCreateBy(SecurityUtils.getUserId().toString());
         centerdataTHousingconstructionDeliveryPersonnel.setCreateName(SecurityUtils.getLoginUser().getSysUser().getNickName());
         centerdataTHousingconstructionDeliveryPersonnel.setCreateTime(DateUtils.getNowDate());
+        extracted(centerdataTHousingconstructionDeliveryPersonnel);
         return centerdataTHousingconstructionDeliveryPersonnelMapper.insertCenterdataTHousingconstructionDeliveryPersonnel(centerdataTHousingconstructionDeliveryPersonnel);
     }
 
@@ -74,9 +99,42 @@ public class CenterdataTHousingconstructionDeliveryPersonnelServiceImpl extends
         centerdataTHousingconstructionDeliveryPersonnel.setUpdateBy(SecurityUtils.getUserId());
         centerdataTHousingconstructionDeliveryPersonnel.setUpdateName(SecurityUtils.getLoginUser().getSysUser().getNickName());
         centerdataTHousingconstructionDeliveryPersonnel.setUpdateTime(DateUtils.getNowDate());
+        extracted(centerdataTHousingconstructionDeliveryPersonnel);
         return centerdataTHousingconstructionDeliveryPersonnelMapper.updateCenterdataTHousingconstructionDeliveryPersonnel(centerdataTHousingconstructionDeliveryPersonnel);
     }
 
+    private void extracted(CenterdataTHousingconstructionDeliveryPersonnel centerdataTHousingconstructionDeliveryPersonnel) {
+        attachService.delAttachByBusId(centerdataTHousingconstructionDeliveryPersonnel.getId());
+        List<Map<String,Object>> list = new ArrayList<>();
+        if (StringUtils.isNotEmpty(centerdataTHousingconstructionDeliveryPersonnel.getLaborContract())) {
+            Map<String,Object> photo = new HashMap<>();
+            photo.put("key","laborContract");
+            photo.put("value",centerdataTHousingconstructionDeliveryPersonnel.getLaborContract());
+            list.add(photo);
+        }
+        if (StringUtils.isNotEmpty(centerdataTHousingconstructionDeliveryPersonnel.getInsurance())) {
+            Map<String,Object> workPhoto = new HashMap<>();
+            workPhoto.put("key","insurance");
+            workPhoto.put("value",centerdataTHousingconstructionDeliveryPersonnel.getInsurance());
+            list.add(workPhoto);
+        }
+        if (StringUtils.isNotEmpty(centerdataTHousingconstructionDeliveryPersonnel.getAssessment())) {
+            Map<String,Object> workPhoto = new HashMap<>();
+            workPhoto.put("key","assessment");
+            workPhoto.put("value",centerdataTHousingconstructionDeliveryPersonnel.getAssessment());
+            list.add(workPhoto);
+        }
+        if (StringUtils.isNotEmpty(centerdataTHousingconstructionDeliveryPersonnel.getAirCard())) {
+            Map<String,Object> workPhoto = new HashMap<>();
+            workPhoto.put("key","airCard");
+            workPhoto.put("value",centerdataTHousingconstructionDeliveryPersonnel.getAirCard());
+            list.add(workPhoto);
+        }
+        if (StringUtils.isNotEmpty(list)) {
+            attachService.addAttach(list, centerdataTHousingconstructionDeliveryPersonnel.getId());
+        }
+    }
+
     /**
      * 批量删除配送人员
      *

src/main/java/com/sooka/sponest/data/housingconstruction/service/impl/CenterdataTHousingconstructionPractitionerServiceImpl.java

@@ -6,6 +6,7 @@ import java.util.List;
 import java.util.Map;
 
 import com.ruoyi.common.core.utils.DateUtils;
+import com.ruoyi.common.core.utils.StringUtils;
 import com.ruoyi.common.core.utils.uuid.IdUtils;
 import com.ruoyi.common.datascope.annotation.DataScopeMutiDept;
 import com.ruoyi.common.security.utils.SecurityUtils;
@@ -39,7 +40,17 @@ public class CenterdataTHousingconstructionPractitionerServiceImpl extends BaseS
      */
     @Override
     public CenterdataTHousingconstructionPractitioner selectCenterdataTHousingconstructionPractitionerById(String id) {
-        return centerdataTHousingconstructionPractitionerMapper.selectCenterdataTHousingconstructionPractitionerById(id);
+        CenterdataTHousingconstructionPractitioner practitioner = centerdataTHousingconstructionPractitionerMapper.selectCenterdataTHousingconstructionPractitionerById(id);
+        Map<String, Object> attachToMap = attachService.getAttachToMap(id);
+        if (attachToMap != null) {
+            if (attachToMap.containsKey("photo")) {
+                practitioner.setPhoto(attachToMap.get("photo").toString());
+            }
+            if (attachToMap.containsKey("workPhoto")) {
+                practitioner.setWorkPhoto(attachToMap.get("workPhoto").toString());
+            }
+        }
+        return practitioner;
     }
 
     /**
@@ -67,7 +78,7 @@ public class CenterdataTHousingconstructionPractitionerServiceImpl extends BaseS
         centerdataTHousingconstructionPractitioner.setCreateBy(SecurityUtils.getUserId().toString());
         centerdataTHousingconstructionPractitioner.setCreateName(SecurityUtils.getLoginUser().getSysUser().getNickName());
         centerdataTHousingconstructionPractitioner.setCreateTime(DateUtils.getNowDate());
-        //extracted(centerdataTHousingconstructionPractitioner);
+        extracted(centerdataTHousingconstructionPractitioner);
         return centerdataTHousingconstructionPractitionerMapper.insertCenterdataTHousingconstructionPractitioner(centerdataTHousingconstructionPractitioner);
     }
 
@@ -82,22 +93,28 @@ public class CenterdataTHousingconstructionPractitionerServiceImpl extends BaseS
         centerdataTHousingconstructionPractitioner.setUpdateBy(SecurityUtils.getUserId());
         centerdataTHousingconstructionPractitioner.setUpdateName(SecurityUtils.getLoginUser().getSysUser().getNickName());
         centerdataTHousingconstructionPractitioner.setUpdateTime(DateUtils.getNowDate());
-        //extracted(centerdataTHousingconstructionPractitioner);
+        extracted(centerdataTHousingconstructionPractitioner);
         return centerdataTHousingconstructionPractitionerMapper.updateCenterdataTHousingconstructionPractitioner(centerdataTHousingconstructionPractitioner);
     }
 
     private void extracted(CenterdataTHousingconstructionPractitioner centerdataTHousingconstructionPractitioner) {
         attachService.delAttachByBusId(centerdataTHousingconstructionPractitioner.getId());
         List<Map<String,Object>> list = new ArrayList<>();
-        Map<String,Object> photo = new HashMap<>();
-        photo.put("key","photo");
-        photo.put("value",centerdataTHousingconstructionPractitioner.getPhone());
-        Map<String,Object> workPhoto = new HashMap<>();
-        workPhoto.put("key","workPhoto");
-        workPhoto.put("value",centerdataTHousingconstructionPractitioner.getWorkPhoto());
-        list.add(photo);
-        list.add(workPhoto);
-        attachService.addAttach(list, centerdataTHousingconstructionPractitioner.getId());
+        if (StringUtils.isNotEmpty(centerdataTHousingconstructionPractitioner.getPhoto())) {
+            Map<String,Object> photo = new HashMap<>();
+            photo.put("key","photo");
+            photo.put("value",centerdataTHousingconstructionPractitioner.getPhoto());
+            list.add(photo);
+        }
+        if (StringUtils.isNotEmpty(centerdataTHousingconstructionPractitioner.getWorkPhoto())) {
+            Map<String,Object> workPhoto = new HashMap<>();
+            workPhoto.put("key","workPhoto");
+            workPhoto.put("value",centerdataTHousingconstructionPractitioner.getWorkPhoto());
+            list.add(workPhoto);
+        }
+        if (StringUtils.isNotEmpty(list)) {
+            attachService.addAttach(list, centerdataTHousingconstructionPractitioner.getId());
+        }
     }
 
     /**