Merge remote-tracking branch 'origin/dev_optimize' into develop

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcCommunitySelfOrganizationDTO.java

@@ -133,4 +133,9 @@ public class IcCommunitySelfOrganizationDTO implements Serializable {
      */
 	private Date updatedTime;
 
+    /**
+     * 备注
+     */
+	private String remark;
+
 }

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/AddCommunitySelfOrganizationFormDTO.java

@@ -56,6 +56,11 @@ public class AddCommunitySelfOrganizationFormDTO implements Serializable {
      */
     private String organizationCreatedTime;
 
+    /**
+     * 备注
+     */
+    private String remark;
+
     /**
      * 经度
      */

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/EditCommunitySelfOrganizationFormDTO.java

@@ -68,6 +68,11 @@ public class EditCommunitySelfOrganizationFormDTO implements Serializable {
      */
     private String latitude;
 
+    /**
+     * 备注
+     */
+    private String remark;
+
     /**
      * 社区自组织ID
      */

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/CommunitySelfOrganizationListDTO.java

@@ -53,6 +53,11 @@ public class CommunitySelfOrganizationListDTO implements Serializable {
      */
     private String organizationCreatedTime;
 
+    /**
+     * 备注
+     */
+    private String remark;
+
     /**
      * 经度
      */

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/IcCommunitySelfOrganizationEntity.java

@@ -106,4 +106,9 @@ public class IcCommunitySelfOrganizationEntity extends BaseEpmetEntity {
      */
 	private String latitude;
 
+    /**
+     * 备注
+     */
+    private String remark;
+
 }

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/ExportCommunitySelfOrganizationExcel.java

@@ -31,6 +31,9 @@ public class ExportCommunitySelfOrganizationExcel {
     @Excel(name = "创建时间", width = 20, needMerge = true)
     private String organizationCreatedTime;
 
+    @Excel(name = "备注", width = 60, needMerge = true)
+    private String remark;
+
     @ExcelCollection(name = "组织成员")
     private List<ImportCommunitySelfOrganizationSon> organizationPersonnel;
 

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/ImportCommunitySelfOrganization.java

@@ -40,6 +40,9 @@ public class ImportCommunitySelfOrganization extends ExcelVerifyInfo {
     @Excel(name = "创建时间", needMerge = true)
     private String organizationCreatedTime;
 
+    @Excel(name = "备注", needMerge = true)
+    private String remark;
+
     @ExcelCollection(name = "组织成员")
     private List<ImportCommunitySelfOrganizationSon> persons;
 

epmet-module/epmet-heart/epmet-heart-server/src/main/resources/db/migration/V0.0.13__add_column_remark.sql

@@ -0,0 +1 @@
+alter table ic_community_self_organization add COLUMN REMARK VARCHAR(500) comment '备注' AFTER ORGANIZATION_CREATED_TIME;

epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcCommunitySelfOrganizationDao.xml

@@ -14,6 +14,7 @@
             LONGITUDE = #{longitude},
             LATITUDE = #{latitude},
             ORGANIZATION_CREATED_TIME = #{organizationCreatedTime},
+            REMARK = #{remark},
             UPDATED_TIME = NOW(),
             UPDATED_BY = #{updatedBy}
         WHERE DEL_FLAG = 0

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/StaffBasicInfoResultDTO.java

@@ -92,5 +92,5 @@ public class StaffBasicInfoResultDTO implements Serializable {
 	 */
 	private String latitude;
 
-
+	private String areaCode;
 }

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

@@ -25,12 +25,15 @@ 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.ServiceConstant;
+import com.epmet.commons.tools.constant.StrConstant;
 import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.ExceptionUtils;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.redis.common.CustomerOrgRedis;
 import com.epmet.commons.tools.redis.common.CustomerStaffRedis;
+import com.epmet.commons.tools.redis.common.bean.AgencyInfoCache;
 import com.epmet.commons.tools.security.password.PasswordUtils;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.CpUserDetailRedis;
@@ -741,6 +744,8 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl<CustomerStaffDao,
 				resultDTO.setLevel(staffInfo.getLevel());
 				resultDTO.setLongitude(staffInfo.getLongitude());
 				resultDTO.setLatitude(staffInfo.getLatitude());
+				AgencyInfoCache agency=CustomerOrgRedis.getAgencyInfo(staffInfo.getAgencyId());
+				resultDTO.setAreaCode(null != agency && StringUtils.isNotBlank(agency.getAreaCode()) ? agency.getAreaCode() : StrConstant.EPMETY_STR);
 			}
 			//获取工作人员所属客户名
 			CustomerDTO dto = new CustomerDTO();

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

@@ -220,6 +220,7 @@ public class IcTripReportRecordServiceImpl extends BaseServiceImpl<IcTripReportR
         dto.setChannel(Collections.emptyList());
         //关注类型，核酸检测：2，疫苗接种：1;行程上报：0
         dto.setAttentionType(NumConstant.TWO);
+        dto.setReason("有重点区域行程");
         list.add(dto);
         vaccinationAddFormDTO.setList(list);
         epidemicSpecialAttentionService.vaccinationAdd( vaccinationAddFormDTO);

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

@@ -136,9 +136,9 @@ public class IcUserChangeRecordServiceImpl extends BaseServiceImpl<IcUserChangeR
                 }
                 //类别变动添加 新增/减少后缀
                 if ("category".equals(resultDto.getType())){
-                    String tempSuffix = "减少";
+                    String tempSuffix = "变更：减少";
                     if (resultDto.getValue().equals(NumConstant.ONE)){
-                        tempSuffix = "增加";
+                        tempSuffix = "变更：增加";
                     }
                     resultDto.setTypeName(resultDto.getTypeName().concat(tempSuffix));
                 }