Merge remote-tracking branch 'remotes/origin/dev_menu_add_color' into 烟台master

epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/GovMenuDTO.java

@@ -65,6 +65,10 @@ public class GovMenuDTO extends TreeStringNode<GovMenuDTO> implements Serializab
      * 菜单图标
      */
 	private String icon;
+	/**
+	 * 菜单颜色
+	 */
+	private String color;
 
     /**
      * 权限标识，如：sys:menu:save

epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/result/OftenUseFunctionListResultDTO.java

@@ -38,4 +38,9 @@ public class OftenUseFunctionListResultDTO implements Serializable {
      * 排序
      */
     private String sort;
+
+    /**
+     * 菜单颜色
+     */
+    private String color;
 }

epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/entity/GovMenuEntity.java

@@ -47,6 +47,10 @@ public class GovMenuEntity extends BaseEpmetEntity {
 	 * 菜单图标
 	 */
 	private String icon;
+	/**
+	 * 菜单颜色
+	 */
+	private String color;
 	/**
 	 * 权限标识，如：sys:menu:save
 	 */

epmet-module/gov-access/gov-access-server/src/main/resources/db/migration/V0.0.9__alter_menu_color.sql

@@ -0,0 +1,2 @@
+ALTER TABLE `epmet_gov_access`.`gov_menu`
+    ADD COLUMN `color` varchar(16)  DEFAULT '' COMMENT '菜单颜色' AFTER `icon`;

epmet-module/gov-access/gov-access-server/src/main/resources/mapper/IcOftenUseFunctionDao.xml

@@ -15,7 +15,8 @@
             ic.MENU_ID,
             gm.url,
             gm.icon,
-            gl.field_value AS menuName
+            gl.field_value AS menuName,
+            gm.color
         FROM ic_often_use_function ic
         INNER JOIN gov_customer_menu gc ON (gc.TABLE_ID = ic.MENU_ID AND gc.DEL_FLAG = '0' AND ic.CUSTOMER_ID = gc.CUSTOMER_ID)
         INNER JOIN gov_menu gm ON (gc.TABLE_ID = gm.id AND gm.DEL_FLAG = 0 AND gm.SHOW_FLAG = 1)

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java

@@ -1171,7 +1171,7 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 			if (groupLeaderUserInfo.success() && null != groupLeaderUserInfo.getData()) {
 				dto.setLeaderName(groupLeaderUserInfo.getData().getShowName());
 			} else {
-				logger.error("组长注册信息查询失败,msg:{},groupId:{}", groupLeaderUserInfo.getMsg(), dto.getGroupId());
+				logger.warn("组长注册信息查询失败,msg:{},groupId:{}", groupLeaderUserInfo.getMsg(), dto.getGroupId());
 			}
 		});
 		return recommendGroupList;

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcEpidemicSpecialAttentionDTO.java

@@ -62,13 +62,16 @@ public class IcEpidemicSpecialAttentionDTO implements Serializable {
     private String isHistory;
 
     /**
-     * 隔离类型,来自字典表
+     * 隔离类型,来自字典表;集中隔离：0;居家隔离1;居家健康监测2;已出隔离期3
      */
     // @NotBlank(message = "isolatedState不能为空",groups = {IcEpidemicSpecialAttentionAdd.class,IcEpidemicSpecialAttentionUpdate.class})
     private String isolatedState;
 
     /**
-     * 关注类型，核酸检测：2，疫苗接种：1，行程上报：0
+     * 关注类型，
+     * 核酸检测：2，
+     * 疫苗接种：1，
+     * 行程上报：0
      */
     @NotNull(message = "attentionType不能为空",groups = {IcEpidemicSpecialAttentionAdd.class,IcEpidemicSpecialAttentionUpdate.class})
     private Integer attentionType;

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/VaccinationListFormDTO.java

@@ -24,6 +24,9 @@ public class VaccinationListFormDTO extends PageFormDTO implements Serializable
     @NotNull(message = "attentionType不能为空",groups = VaccinationListForm.class)
     private Integer attentionType;
 
+    /**
+     * 隔离类型,来自字典表;集中隔离：0;居家隔离1;居家健康监测2;已出隔离期3
+     */
     private String isolatedState;
     private String isHistory;
 

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

@@ -117,6 +117,9 @@ public class VaccinationListResultDTO implements Serializable {
      * 小区名+楼栋名+单元名+房屋名
      */
     private String allName;
+    /**
+     * 隔离类型,来自字典表;集中隔离：0;居家隔离1;居家健康监测2;已出隔离期3
+     */
     private String isolatedState;
     private String id;
     private String userId;

epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcEpidemicSpecialAttentionEntity.java

@@ -49,7 +49,7 @@ public class IcEpidemicSpecialAttentionEntity extends BaseEpmetEntity {
 	private String isHistory;
 
 	/**
-	 * 隔离类型,来自字典表
+	 * 隔离类型,来自字典表;集中隔离：0;居家隔离1;居家健康监测2;已出隔离期3
 	 */
 	private String isolatedState;
 

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

@@ -309,6 +309,10 @@ public class IcEpidemicSpecialAttentionServiceImpl extends BaseServiceImpl<IcEpi
             e.setPids(agencyInfo.getPids());
             e.setCustomerId(formDTO.getCustomerId());
             e.setIsHistory(NumConstant.ZERO_STR);
+            if(StringUtils.isBlank(e.getIsolatedState())){
+                //从行程上报界面，点击加入重点人群关注，默认隔离状态是居家隔离
+                e.setIsolatedState(NumConstant.ONE_STR);
+            }
         });
         insertBatch(entities);
         //新增通知表信息

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

@@ -224,7 +224,7 @@ public class UserBaseInfoServiceImpl extends BaseServiceImpl<UserBaseInfoDao, Us
                 userBaseInfoList.add(baseInfo);
                 //}
             }else{
-                logger.error(String.format("userId【%s】,构造UserBaseInfoResultDTO为空",id));
+                logger.warn(String.format("userId【%s】,构造UserBaseInfoResultDTO为空",id));
             }
 
         });

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

@@ -579,7 +579,7 @@ public class UserResiInfoServiceImpl extends BaseServiceImpl<UserResiInfoDao, Us
 		UserRoleResultDTO role = userRoleService.getUserResidentRole(userResiInfoDTO.getCustomerId(), userResiInfoDTO.getUserId());
 		if (null == role) {
 			resDTO.setGridId(userResiInfoDTO.getGridId());
-			resDTO.setGridName(gridInfo.getGridName());
+			resDTO.setGridName(gridInfo.getGridNamePath());
 			resDTO.setAgencyId(gridInfo.getPid());
 
 			//获取钉钉用户信息
@@ -639,7 +639,7 @@ public class UserResiInfoServiceImpl extends BaseServiceImpl<UserResiInfoDao, Us
 				if (null == regGridInfo) {
 					throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取注册网格信息失败", "获取注册网格信息失败");
 				}
-				resDTO.setGridName(regGridInfo.getGridName());
+				resDTO.setGridName(regGridInfo.getGridNamePath());
 				resDTO.setAgencyId(regGridInfo.getPid());
 			}
 		}

epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.72__icepidemic_ISOLATED_STATE .sql

@@ -0,0 +1 @@
+ALTER TABLE ic_epidemic_special_attention MODIFY COLUMN ISOLATED_STATE VARCHAR(20) COMMENT '隔离类型,来自字典表;集中隔离：0;居家隔离1;居家健康监测2;已出隔离期3';