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

epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcExportTemplateServiceImpl.java

@@ -124,7 +124,7 @@ public class IcExportTemplateServiceImpl extends BaseServiceImpl<IcExportTemplat
                 //增加校验 同组织内模板名不能重复
                 templist.forEach(t -> {
                     if (formDTO.getName().equals(t.getName())) {
-                        throw new EpmetException(9999, "当前组织下已存在相同名称的模板!", "当前组织下已存在相同名称的模板!");
+                        throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "当前组织下已存在相同名称的模板!", "当前组织下已存在相同名称的模板!");
                     }
                 });
                 sort = templist.get(NumConstant.ZERO).getSort() + NumConstant.ONE;

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcEpidemicSpecialAttentionServiceImpl.java

@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.commons.tools.constant.StrConstant;
 import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult;
 import com.epmet.commons.tools.exception.EpmetException;
 import com.epmet.commons.tools.exception.ExceptionUtils;
@@ -349,6 +350,19 @@ public class IcEpidemicSpecialAttentionServiceImpl extends BaseServiceImpl<IcEpi
         e.setReason(formDTO.getReason());
         e.setRemark(formDTO.getRemark());
         e.setIsolatedState(formDTO.getIsolatedState());
+        //需求来源于磐石： http://zentao.elinkservice.cn/story-view-713.html
+        e.setGkStartTime(StringUtils.isNotBlank(formDTO.getGkStartTime()) ? formDTO.getGkStartTime() : StrConstant.EPMETY_STR);
+        e.setGkEndTime(StringUtils.isNotBlank(formDTO.getGkEndTime()) ? formDTO.getGkEndTime() : StrConstant.EPMETY_STR);
+        e.setGbName(StringUtils.isNotBlank(formDTO.getGbName()) ? formDTO.getGbName() : StrConstant.EPMETY_STR);
+        e.setGbMobile(StringUtils.isNotBlank(formDTO.getGbMobile()) ? formDTO.getGbMobile() : StrConstant.EPMETY_STR);
+        e.setGridManager(StringUtils.isNotBlank(formDTO.getGridManager()) ? formDTO.getGridManager() : StrConstant.EPMETY_STR);
+        e.setGridManagerMobile(StringUtils.isNotBlank(formDTO.getGridManagerMobile()) ? formDTO.getGridManagerMobile() : StrConstant.EPMETY_STR);
+        e.setHealthWorker(StringUtils.isNotBlank(formDTO.getHealthWorker()) ? formDTO.getHealthWorker() : StrConstant.EPMETY_STR);
+        e.setHealthWorkerMobile(StringUtils.isNotBlank(formDTO.getHealthWorkerMobile()) ? formDTO.getHealthWorkerMobile() : StrConstant.EPMETY_STR);
+        e.setPoliceName(StringUtils.isNotBlank(formDTO.getPoliceName()) ? formDTO.getPoliceName() : StrConstant.EPMETY_STR);
+        e.setPoliceMobile(StringUtils.isNotBlank(formDTO.getPoliceMobile()) ? formDTO.getPoliceMobile() : StrConstant.EPMETY_STR);
+        e.setVolunteerName(StringUtils.isNotBlank(formDTO.getVolunteerName()) ? formDTO.getVolunteerName() : StrConstant.EPMETY_STR);
+        e.setVolunteerMobile(StringUtils.isNotBlank(formDTO.getVolunteerMobile()) ? formDTO.getVolunteerMobile() : StrConstant.EPMETY_STR);
         update(e,w);
         if (CollectionUtils.isNotEmpty(formDTO.getChannel())){
             SendNoticeFormDTO dto = new SendNoticeFormDTO();

epmet-user/epmet-user-server/src/main/resources/mapper/IcBirthRecordDao.xml

@@ -68,6 +68,9 @@
             ibr.UPDATED_TIME
 		from ic_birth_record ibr
 		left join ic_resi_user iru on iru.ID_CARD = ibr.ID_CARD and iru.DEL_FLAG = 0
+        <if test='customerId != "" and customerId != null'>
+            and iru.CUSTOMER_ID=#{customerId}
+        </if>
 		where ibr.DEL_FLAG = 0
         <if test='customerId != "" and customerId != null'>
             AND ibr.CUSTOMER_ID = #{customerId}

epmet-user/epmet-user-server/src/main/resources/mapper/IcMoveInRecordDao.xml

@@ -30,7 +30,7 @@
             mir.householder_name householderName,
             mir.householder_relation householderRelation
         FROM ic_move_in_record mir
-        left join ic_resi_user iru on iru.ID_CARD = mir.ID_CARD and iru.DEL_FLAG = 0
+        left join ic_resi_user iru on iru.ID_CARD = mir.ID_CARD and iru.DEL_FLAG = 0 and iru.CUSTOMER_ID=#{customerId}
         WHERE  mir.del_flag = '0'
         AND mir.customer_id=#{customerId}
         <if test="gridId != null and gridId != '' ">