diff --git a/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/SysUserAnalysisOpenIdFormDTO.java b/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/SysUserAnalysisOpenIdFormDTO.java index 0b835b880..8c51b593f 100644 --- a/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/SysUserAnalysisOpenIdFormDTO.java +++ b/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/SysUserAnalysisOpenIdFormDTO.java @@ -20,11 +20,11 @@ public class SysUserAnalysisOpenIdFormDTO implements Serializable { * 用户名 */ @NotBlank(message = "用户名不能为空") - private String username; + private String userId; /** * 微信analysis_open_id */ @NotBlank(message = "微信analysis_open_id不能为空") private String analysisOpenId; -} \ No newline at end of file +} diff --git a/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/SysUserOpenIdFormDTO.java b/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/SysUserOpenIdFormDTO.java index 5cbfd7004..bc1b462d4 100644 --- a/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/SysUserOpenIdFormDTO.java +++ b/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/SysUserOpenIdFormDTO.java @@ -20,7 +20,7 @@ public class SysUserOpenIdFormDTO implements Serializable { * 用户名 */ @NotBlank(message = "用户名不能为空") - private String username; + private String userId; /** * 微信openId diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/rocketmq/dto/OrganizationModifyDTO.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/rocketmq/dto/OrganizationModifyDTO.java index d6b508709..e82b55d2b 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/rocketmq/dto/OrganizationModifyDTO.java +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/rocketmq/dto/OrganizationModifyDTO.java @@ -34,4 +34,21 @@ public class OrganizationModifyDTO implements Serializable { * 部门类型 */ private String typeKey; + + /** + * 父所有部门ID + */ + private String parentDeptIds; + /** + * 父所有部门 + */ + private String parentDeptNames; + /** + * 所有部门ID + */ + private String allDeptIds; + /** + * 所有部门 + */ + private String allDeptNames; } diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysAnalysisMenuServiceImpl.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysAnalysisMenuServiceImpl.java index a4db1690f..b5d658186 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysAnalysisMenuServiceImpl.java +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysAnalysisMenuServiceImpl.java @@ -159,4 +159,4 @@ public class SysAnalysisMenuServiceImpl extends BaseServiceImpl @@ -128,11 +129,11 @@ - UPDATE sys_user SET work_open_id = #{openId} WHERE username = #{username} AND del_flag = 0 + UPDATE sys_user SET work_open_id = #{openId} WHERE id = #{userId} AND del_flag = 0 - UPDATE sys_user SET analysis_open_id = #{analysisOpenId} WHERE username = #{username} AND del_flag = 0 + UPDATE sys_user SET analysis_open_id = #{analysisOpenId} WHERE id = #{userId} AND del_flag = 0 diff --git a/esua-epdc/epdc-auth/src/main/java/com/elink/esua/epdc/controller/AuthController.java b/esua-epdc/epdc-auth/src/main/java/com/elink/esua/epdc/controller/AuthController.java index 05a1a951d..4a387f8b4 100644 --- a/esua-epdc/epdc-auth/src/main/java/com/elink/esua/epdc/controller/AuthController.java +++ b/esua-epdc/epdc-auth/src/main/java/com/elink/esua/epdc/controller/AuthController.java @@ -137,6 +137,7 @@ public class AuthController { if (result.success()) { // 解绑上一次登录账户并绑定当前账户 SysUserOpenIdFormDTO sysUserOpenIdFormDto = ConvertUtils.sourceToTarget(workUserLoginDto, SysUserOpenIdFormDTO.class); + sysUserOpenIdFormDto.setUserId(result.getData().getUserId()); authService.modifyOpenId(sysUserOpenIdFormDto); } @@ -160,6 +161,7 @@ public class AuthController { if (result.success()) { // 解绑上一次登录账户并绑定当前账户 SysUserAnalysisOpenIdFormDTO sysUserOpenIdFormDto = ConvertUtils.sourceToTarget(analysisUserLoginDto, SysUserAnalysisOpenIdFormDTO.class); + sysUserOpenIdFormDto.setUserId(result.getData().getUserId()); authService.modifyAnalysisOpenId(sysUserOpenIdFormDto); } diff --git a/esua-epdc/epdc-auth/src/main/java/com/elink/esua/epdc/service/impl/AuthServiceImpl.java b/esua-epdc/epdc-auth/src/main/java/com/elink/esua/epdc/service/impl/AuthServiceImpl.java index a37d720de..b060e749f 100644 --- a/esua-epdc/epdc-auth/src/main/java/com/elink/esua/epdc/service/impl/AuthServiceImpl.java +++ b/esua-epdc/epdc-auth/src/main/java/com/elink/esua/epdc/service/impl/AuthServiceImpl.java @@ -215,7 +215,7 @@ public class AuthServiceImpl implements AuthService { authorization.setDeptName(user.getDeptName()); authorization.setUserTagKey(user.getTypeKey()); authorization.setRegisterState(NumConstant.ONE_STR); - + authorization.setUserId(user.getId().toString()); userDeptTask.packageUserDeptOptions(user.getId()); return new Result().ok(authorization); @@ -291,7 +291,7 @@ public class AuthServiceImpl implements AuthService { authorization.setDeptName(user.getDeptName()); authorization.setUserTagKey(user.getTypeKey()); authorization.setRegisterState(NumConstant.ONE_STR); - + authorization.setUserId(user.getId().toString()); userDeptTask.packageUserDeptOptions(user.getId()); return new Result().ok(authorization); diff --git a/esua-epdc/epdc-auth/src/main/resources/application.yml b/esua-epdc/epdc-auth/src/main/resources/application.yml index a113a8d12..e1d0d0a88 100644 --- a/esua-epdc/epdc-auth/src/main/resources/application.yml +++ b/esua-epdc/epdc-auth/src/main/resources/application.yml @@ -69,4 +69,4 @@ jwt: #秘钥 secret: 7016867071f0ebf1c46f123eaaf4b9d6[elink.epdc] #token有效时长，默认7天，单位秒 - expire: 604800 + expire: 31536000 diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/WorkUserServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/WorkUserServiceImpl.java index 48c3fa03b..3d6717962 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/WorkUserServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/WorkUserServiceImpl.java @@ -147,6 +147,7 @@ public class WorkUserServiceImpl implements WorkUserService { return new Result().error("获取用户部门权限失败"); } workUserFromDto.setGridIdList(user.getDeptIdList()); + workUserFromDto.setUserId(user.getId()); } return userFeignClient.getWorkUserList(workUserFromDto); } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/resources/application.yml b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/resources/application.yml index 807785c9f..2554eb8a4 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/resources/application.yml +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/resources/application.yml @@ -186,7 +186,7 @@ wx: token: - expire: 21600 + expire: 604800 jwt: token: diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/evaluate/EvaluateOfficerDao.xml b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/evaluate/EvaluateOfficerDao.xml index 6d8aeb995..0066334c8 100644 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/evaluate/EvaluateOfficerDao.xml +++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/evaluate/EvaluateOfficerDao.xml @@ -38,6 +38,7 @@ UPDATED_TIME from epdc_evaluate_officer where DEL_FLAG = '0' + and ID like '%' #{id} '%' @@ -294,4 +295,4 @@ LIMIT #{pageIndex},#{pageSize} - \ No newline at end of file + diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/dao/EpdcEventsDao.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/dao/EpdcEventsDao.java index d16a834a9..44c25e72e 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/dao/EpdcEventsDao.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/dao/EpdcEventsDao.java @@ -174,7 +174,7 @@ public interface EpdcEventsDao extends BaseDao { /** * * 查询需要修改组织机构信息事件 - * + * @params [deptId] * @return java.util.List * @author liuchuang diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java index ecd5c7d4d..ca5d165d0 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java @@ -695,27 +695,47 @@ public class EpdcEventsServiceImpl extends BaseServiceImpl entities = new ArrayList<>(); for (EpdcEventsDTO events: eventsList) { EpdcEventsEntity entity = new EpdcEventsEntity(); - if (StringUtils.isNotEmpty(events.getParentDeptIds()) && StringUtils.isNotEmpty(events.getParentDeptNames())) { - List parentDeptIds = Arrays.asList(events.getParentDeptIds().split(",")); - List parentDeptNames = Arrays.asList(events.getParentDeptNames().split("-")); - int index = parentDeptIds.indexOf(dto.getDeptId().toString()); - if (index >= 0 && parentDeptNames.size() > index) { - parentDeptNames.set(index, dto.getNewDeptName()); - entity.setId(events.getId()); - entity.setParentDeptNames(StringUtils.join(parentDeptNames, "-")); - } + if("grid_party".equals(dto.getTypeKey())) { + entity.setId(events.getId()); + entity.setAllDeptIds(dto.getAllDeptIds()); + entity.setAllDeptNames(dto.getAllDeptNames()); + entity.setParentDeptIds(dto.getParentDeptIds()); + entity.setParentDeptNames(dto.getParentDeptNames()); } - - if (StringUtils.isNotEmpty(events.getAllDeptIds()) && StringUtils.isNotEmpty(events.getAllDeptNames())) { + if("community_party".equals(dto.getTypeKey())) { List allDeptIds = Arrays.asList(events.getAllDeptIds().split(",")); List allDeptNames = Arrays.asList(events.getAllDeptNames().split("-")); int index = allDeptIds.indexOf(dto.getDeptId().toString()); - if (index >= 0 && allDeptNames.size() > index) { - allDeptNames.set(index, dto.getNewDeptName()); - entity.setId(events.getId()); - entity.setAllDeptNames(StringUtils.join(allDeptNames, "-")); - } + String gridName = allDeptNames.get(index + 1); + String girdId = allDeptNames.get(index + 1); + entity.setId(events.getId()); + entity.setAllDeptIds(dto.getAllDeptIds() + "," + girdId); + entity.setAllDeptNames(dto.getAllDeptNames() + "-" + gridName); + entity.setParentDeptIds(dto.getAllDeptIds()); + entity.setParentDeptNames(dto.getAllDeptNames()); + } +// if (StringUtils.isNotEmpty(events.getParentDeptIds()) && StringUtils.isNotEmpty(events.getParentDeptNames())) { +// List parentDeptIds = Arrays.asList(events.getParentDeptIds().split(",")); +// List parentDeptNames = Arrays.asList(events.getParentDeptNames().split("-")); +// int index = parentDeptIds.indexOf(dto.getDeptId().toString()); +// if (index >= 0 && parentDeptNames.size() > index) { +// parentDeptNames.set(index, dto.getNewDeptName()); +// entity.setId(events.getId()); +// entity.setParentDeptNames(StringUtils.join(parentDeptNames, "-")); +// } +// } +// +// if (StringUtils.isNotEmpty(events.getAllDeptIds()) && StringUtils.isNotEmpty(events.getAllDeptNames())) { +// List allDeptIds = Arrays.asList(events.getAllDeptIds().split(",")); +// List allDeptNames = Arrays.asList(events.getAllDeptNames().split("-")); +// int index = allDeptIds.indexOf(dto.getDeptId().toString()); +// if (index >= 0 && allDeptNames.size() > index) { +// allDeptNames.set(index, dto.getNewDeptName()); +// entity.setId(events.getId()); +// entity.setAllDeptNames(StringUtils.join(allDeptNames, "-")); +// } +// } entities.add(entity); } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueServiceImpl.java index 295d604bd..08f983c80 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueServiceImpl.java @@ -558,27 +558,47 @@ public class IssueServiceImpl extends BaseServiceImpl imp List entities = new ArrayList<>(); for (IssueDTO issue: issueList) { IssueEntity entity = new IssueEntity(); - if (StringUtils.isNotEmpty(issue.getParentDeptIds()) && StringUtils.isNotEmpty(issue.getParentDeptNames())) { - List parentDeptIds = Arrays.asList(issue.getParentDeptIds().split(",")); - List parentDeptNames = Arrays.asList(issue.getParentDeptNames().split("-")); - int index = parentDeptIds.indexOf(dto.getDeptId().toString()); - if (index >= 0 && parentDeptNames.size() > index) { - parentDeptNames.set(index, dto.getNewDeptName()); - entity.setId(issue.getId()); - entity.setParentDeptNames(StringUtils.join(parentDeptNames, "-")); - } + if("grid_party".equals(dto.getTypeKey())) { + entity.setId(issue.getId()); + entity.setAllDeptIds(dto.getAllDeptIds()); + entity.setAllDeptNames(dto.getAllDeptNames()); + entity.setParentDeptIds(dto.getParentDeptIds()); + entity.setParentDeptNames(dto.getParentDeptNames()); } - - if (StringUtils.isNotEmpty(issue.getAllDeptIds()) && StringUtils.isNotEmpty(issue.getAllDeptNames())) { + if("community_party".equals(dto.getTypeKey())) { List allDeptIds = Arrays.asList(issue.getAllDeptIds().split(",")); List allDeptNames = Arrays.asList(issue.getAllDeptNames().split("-")); int index = allDeptIds.indexOf(dto.getDeptId().toString()); - if (index >= 0 && allDeptNames.size() > index) { - allDeptNames.set(index, dto.getNewDeptName()); - entity.setId(issue.getId()); - entity.setAllDeptNames(StringUtils.join(allDeptNames, "-")); - } + String gridName = allDeptNames.get(index + 1); + String girdId = allDeptNames.get(index + 1); + entity.setId(issue.getId()); + entity.setAllDeptIds(dto.getAllDeptIds() + "," + girdId); + entity.setAllDeptNames(dto.getAllDeptNames() + "-" + gridName); + entity.setParentDeptIds(dto.getAllDeptIds()); + entity.setParentDeptNames(dto.getAllDeptNames()); + } +// if (StringUtils.isNotEmpty(issue.getParentDeptIds()) && StringUtils.isNotEmpty(issue.getParentDeptNames())) { +// List parentDeptIds = Arrays.asList(issue.getParentDeptIds().split(",")); +// List parentDeptNames = Arrays.asList(issue.getParentDeptNames().split("-")); +// int index = parentDeptIds.indexOf(dto.getDeptId().toString()); +// if (index >= 0 && parentDeptNames.size() > index) { +// parentDeptNames.set(index, dto.getNewDeptName()); +// entity.setId(issue.getId()); +// entity.setParentDeptNames(StringUtils.join(parentDeptNames, "-")); +// } +// } +// +// if (StringUtils.isNotEmpty(issue.getAllDeptIds()) && StringUtils.isNotEmpty(issue.getAllDeptNames())) { +// List allDeptIds = Arrays.asList(issue.getAllDeptIds().split(",")); +// List allDeptNames = Arrays.asList(issue.getAllDeptNames().split("-")); +// int index = allDeptIds.indexOf(dto.getDeptId().toString()); +// if (index >= 0 && allDeptNames.size() > index) { +// allDeptNames.set(index, dto.getNewDeptName()); +// entity.setId(issue.getId()); +// entity.setAllDeptNames(StringUtils.join(allDeptNames, "-")); +// } +// } entities.add(entity); } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java index e66eefd71..7503c12e2 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java @@ -1821,27 +1821,47 @@ public class ItemServiceImpl extends BaseServiceImpl implem List entities = new ArrayList<>(); for (ItemDTO item: itemList) { ItemEntity entity = new ItemEntity(); - if (StringUtils.isNotEmpty(item.getParentDeptIds()) && StringUtils.isNotEmpty(item.getParentDeptNames())) { - List parentDeptIds = Arrays.asList(item.getParentDeptIds().split(",")); - List parentDeptNames = Arrays.asList(item.getParentDeptNames().split("-")); - int index = parentDeptIds.indexOf(dto.getDeptId().toString()); - if (index >= 0 && parentDeptNames.size() > index) { - parentDeptNames.set(index, dto.getNewDeptName()); - entity.setId(item.getId()); - entity.setParentDeptNames(StringUtils.join(parentDeptNames, "-")); - } + if("grid_party".equals(dto.getTypeKey())) { + entity.setId(item.getId()); + entity.setAllDeptIds(dto.getAllDeptIds()); + entity.setAllDeptNames(dto.getAllDeptNames()); + entity.setParentDeptIds(dto.getParentDeptIds()); + entity.setParentDeptNames(dto.getParentDeptNames()); } - - if (StringUtils.isNotEmpty(item.getAllDeptIds()) && StringUtils.isNotEmpty(item.getAllDeptNames())) { + if("community_party".equals(dto.getTypeKey())) { List allDeptIds = Arrays.asList(item.getAllDeptIds().split(",")); List allDeptNames = Arrays.asList(item.getAllDeptNames().split("-")); int index = allDeptIds.indexOf(dto.getDeptId().toString()); - if (index >= 0 && allDeptNames.size() > index) { - allDeptNames.set(index, dto.getNewDeptName()); - entity.setId(item.getId()); - entity.setAllDeptNames(StringUtils.join(allDeptNames, "-")); - } + String gridName = allDeptNames.get(index + 1); + String girdId = allDeptNames.get(index + 1); + entity.setId(item.getId()); + entity.setAllDeptIds(dto.getAllDeptIds() + "," + girdId); + entity.setAllDeptNames(dto.getAllDeptNames() + "-" + gridName); + entity.setParentDeptIds(dto.getAllDeptIds()); + entity.setParentDeptNames(dto.getAllDeptNames()); + } +// if (StringUtils.isNotEmpty(item.getParentDeptIds()) && StringUtils.isNotEmpty(item.getParentDeptNames())) { +// List parentDeptIds = Arrays.asList(item.getParentDeptIds().split(",")); +// List parentDeptNames = Arrays.asList(item.getParentDeptNames().split("-")); +// int index = parentDeptIds.indexOf(dto.getDeptId().toString()); +// if (index >= 0 && parentDeptNames.size() > index) { +// parentDeptNames.set(index, dto.getNewDeptName()); +// entity.setId(item.getId()); +// entity.setParentDeptNames(StringUtils.join(parentDeptNames, "-")); +// } +// } +// +// if (StringUtils.isNotEmpty(item.getAllDeptIds()) && StringUtils.isNotEmpty(item.getAllDeptNames())) { +// List allDeptIds = Arrays.asList(item.getAllDeptIds().split(",")); +// List allDeptNames = Arrays.asList(item.getAllDeptNames().split("-")); +// int index = allDeptIds.indexOf(dto.getDeptId().toString()); +// if (index >= 0 && allDeptNames.size() > index) { +// allDeptNames.set(index, dto.getNewDeptName()); +// entity.setId(item.getId()); +// entity.setAllDeptNames(StringUtils.join(allDeptNames, "-")); +// } +// } entities.add(entity); } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/rocketmq/dto/OrganizationModifyDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/rocketmq/dto/OrganizationModifyDTO.java index f0f6ff6ef..a975b0ab6 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/rocketmq/dto/OrganizationModifyDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/rocketmq/dto/OrganizationModifyDTO.java @@ -25,6 +25,7 @@ public class OrganizationModifyDTO implements Serializable { */ private String oldDeptName; + /** * 新部门名称 */ @@ -34,4 +35,21 @@ public class OrganizationModifyDTO implements Serializable { * 部门类型 */ private String typeKey; + + /** + * 父所有部门ID + */ + private String parentDeptIds; + /** + * 父所有部门 + */ + private String parentDeptNames; + /** + * 所有部门ID + */ + private String allDeptIds; + /** + * 所有部门 + */ + private String allDeptNames; } diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcWorkUserFromDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcWorkUserFromDTO.java index 06550dedb..ce5b9335d 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcWorkUserFromDTO.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcWorkUserFromDTO.java @@ -33,6 +33,8 @@ public class EpdcWorkUserFromDTO implements Serializable { */ private Long gridId; + private Long userId; + /** * 页码 */ diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/redis/UserRedis.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/redis/UserRedis.java index ab9556b81..7ad706575 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/redis/UserRedis.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/redis/UserRedis.java @@ -16,9 +16,15 @@ */ package com.elink.esua.epdc.redis; +import com.elink.esua.epdc.commons.tools.redis.RedisKeys; import com.elink.esua.epdc.commons.tools.redis.RedisUtils; +import com.elink.esua.epdc.dto.epdc.result.EpdcWorkUserResultDTO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; +import org.springframework.util.StringUtils; + +import java.util.ArrayList; +import java.util.List; /** * 用户信息表 @@ -31,6 +37,39 @@ public class UserRedis { @Autowired private RedisUtils redisUtils; + public void set(List list, Long userId,String partyFlag,String authenticatedFlag, Integer pageIndex,Integer pageSize,long expire) { + if (StringUtils.isEmpty(list)) { + return; + } + String key = RedisKeys.getWorkUserListKey(partyFlag,authenticatedFlag,userId,pageIndex,pageSize); + redisUtils.set(key,list,expire); + + } + + public List getworkUserList(Long userId,String partyFlag,String authenticatedFlag,Integer pageIndex,Integer pageSize) { + + String key = RedisKeys.getWorkUserListKey(partyFlag,authenticatedFlag,userId,pageIndex,pageSize); + + Object data = redisUtils.get(key); + + List list = castList(data,EpdcWorkUserResultDTO.class); + + return list; + } + public static List castList(Object obj, Class clazz) + { + List result = new ArrayList(); + if(obj instanceof List) + { + for (Object o : (List) obj) + { + result.add(clazz.cast(o)); + } + return result; + } + return null; + } + public void delete(Object[] ids) { } @@ -43,4 +82,4 @@ public class UserRedis { return null; } -} \ No newline at end of file +} diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java index 84d5ee668..ef966a8d1 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java @@ -39,6 +39,7 @@ import com.elink.esua.epdc.commons.tools.enums.YesOrNoEnum; import com.elink.esua.epdc.commons.tools.enums.pointsenum.PointsOperationEnum; import com.elink.esua.epdc.commons.tools.exception.RenException; import com.elink.esua.epdc.commons.tools.page.PageData; +import com.elink.esua.epdc.commons.tools.redis.RedisUtils; import com.elink.esua.epdc.commons.tools.security.user.SecurityUser; import com.elink.esua.epdc.commons.tools.utils.*; import com.elink.esua.epdc.config.StreamUtils; @@ -62,6 +63,7 @@ import com.elink.esua.epdc.enums.PartyMemberRegFlagEnum; import com.elink.esua.epdc.excel.UserExcel; import com.elink.esua.epdc.exception.UserModuleErrorCode; import com.elink.esua.epdc.feign.AdminFeignClient; +import com.elink.esua.epdc.redis.UserRedis; import com.elink.esua.epdc.rocketmq.dto.OrganizationModifyDTO; import com.elink.esua.epdc.service.*; import com.elink.esua.epdc.util.AppUserUtils; @@ -116,6 +118,9 @@ public class UserServiceImpl extends BaseServiceImpl implem @Autowired private AdminFeignClient adminFeignClient; + @Autowired + private UserRedis userRedis; + @Override @DataSource(value = DataSourceNames.FIRST) public PageData page(Map params) { @@ -1075,8 +1080,13 @@ public class UserServiceImpl extends BaseServiceImpl implem String partyFlag = workUserFromDto.getPartyFlag(); String authenticatedFlag = workUserFromDto.getAuthenticatedFlag(); + // 修改于2020-06-08：目的是与 PC 端数据保持一致 - List epdcWorkUserResultDTOS = new ArrayList(); + List epdcWorkUserResultDTOS; + epdcWorkUserResultDTOS = userRedis.getworkUserList(workUserFromDto.getUserId(),partyFlag,authenticatedFlag,pageIndex,workUserFromDto.getPageSize()); + if (epdcWorkUserResultDTOS !=null && epdcWorkUserResultDTOS.size() > 0) { + return new Result>().ok(epdcWorkUserResultDTOS); + } if (YesOrNoEnum.NO.value().equals(partyFlag) && YesOrNoEnum.NO.value().equals(authenticatedFlag)) { // 待认证居民 workUserFromDto.setSelectFlag(NumConstant.ZERO_STR); @@ -1092,6 +1102,7 @@ public class UserServiceImpl extends BaseServiceImpl implem // 党员认证失败 epdcWorkUserResultDTOS = baseDao.selectAppPartyAuthenticationFailedList(workUserFromDto); } + userRedis.set(epdcWorkUserResultDTOS,workUserFromDto.getUserId(),partyFlag,authenticatedFlag,pageIndex,workUserFromDto.getPageSize(),3600); return new Result>().ok(epdcWorkUserResultDTOS); /*// 查询认证成的居民或党员 diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml index 086b09f06..806b58295 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml @@ -428,7 +428,7 @@ WHERE u.DEL_FLAG = '0' AND u.WX_OPEN_ID = #{wxOpenId} - AND u.WX_UNION_ID = #{wxUnionId} + ORDER BY ur.SWITCHED_TIME DESC diff --git a/esua-epdc/kettle-Code/esua_epdc_analysis_job/analysis_synchronize/epdc_item.ktr b/esua-epdc/kettle-Code/esua_epdc_analysis_job/analysis_synchronize/epdc_item.ktr index 79a7aeebd..cd767347d 100644 --- a/esua-epdc/kettle-Code/esua_epdc_analysis_job/analysis_synchronize/epdc_item.ktr +++ b/esua-epdc/kettle-Code/esua_epdc_analysis_job/analysis_synchronize/epdc_item.ktr @@ -804,20 +804,12 @@ esua_epdc_events 0 SELECT * FROM epdc_item - WHERE (UPDATED_TIME > ? - AND UPDATED_TIME <= ?) or del_flag=1 + WHERE (UPDATED_TIME > '2021-07-08 09:53:57' + AND UPDATED_TIME <= '2021-07-09 00:00:29') or del_flag=1 N N - - START_TIME - Date - - - END_TIME - Date - @@ -847,7 +839,7 @@ esua_epdc_analysis SELECT - IFNULL((SELECT UPDATED_TIME FROM meta_epdc_item ORDER BY UPDATED_TIME DESC LIMIT 1),'2000-01-01 00:00:00') AS START_TIME, + IFNULL('2021-07-08 09:53:57','2000-01-01 00:00:00') AS START_TIME, END_TIME FROM epdc_kettle_job_record ORDER BY CREATED_TIME diff --git a/esua-epdc/kettle-Code/esua_epdc_analysis_job/analysis_synchronize/epdc_kpi_case_handling.ktr b/esua-epdc/kettle-Code/esua_epdc_analysis_job/analysis_synchronize/epdc_kpi_case_handling.ktr index 645c324e4..7e99657fc 100644 --- a/esua-epdc/kettle-Code/esua_epdc_analysis_job/analysis_synchronize/epdc_kpi_case_handling.ktr +++ b/esua-epdc/kettle-Code/esua_epdc_analysis_job/analysis_synchronize/epdc_kpi_case_handling.ktr @@ -670,6 +670,11 @@ DEL_FLAG Y + + PLUS_SCORE + PLUS_SCORE + Y + diff --git a/esua-epdc/kettle-Code/esua_epdc_analysis_job/analysis_synchronize/epdc_kpi_grid_entity.ktr b/esua-epdc/kettle-Code/esua_epdc_analysis_job/analysis_synchronize/epdc_kpi_grid_entity.ktr index 7726f1ced..01189f6c2 100644 --- a/esua-epdc/kettle-Code/esua_epdc_analysis_job/analysis_synchronize/epdc_kpi_grid_entity.ktr +++ b/esua-epdc/kettle-Code/esua_epdc_analysis_job/analysis_synchronize/epdc_kpi_grid_entity.ktr @@ -715,6 +715,11 @@ DEL_FLAG Y + + PLUS_SCORE + PLUS_SCORE + Y + diff --git a/esua-epdc/kettle-Code/esua_epdc_behavior/behavior.kjb b/esua-epdc/kettle-Code/esua_epdc_behavior/behavior.kjb index 71fdf9ad2..01929accf 100644 --- a/esua-epdc/kettle-Code/esua_epdc_behavior/behavior.kjb +++ b/esua-epdc/kettle-Code/esua_epdc_behavior/behavior.kjb @@ -294,8 +294,8 @@ Y N - Y - 2 + N + 0 0 60 3 diff --git a/esua-epdc/kettle-Code/governanceRankingMonth/blow_whistle/同步到中间表/吹哨-项目-月-基础数据.ktr b/esua-epdc/kettle-Code/governanceRankingMonth/blow_whistle/同步到中间表/吹哨-项目-月-基础数据.ktr index 289c03847..99fe930c2 100644 --- a/esua-epdc/kettle-Code/governanceRankingMonth/blow_whistle/同步到中间表/吹哨-项目-月-基础数据.ktr +++ b/esua-epdc/kettle-Code/governanceRankingMonth/blow_whistle/同步到中间表/吹哨-项目-月-基础数据.ktr @@ -631,23 +631,24 @@ SELECT mi.GRID_ID, CASE -- 已结案的项目时间 减去 项目的创建时间 小于等于 有效时间 - WHEN TIMESTAMPDIFF(HOUR, mi.CREATED_TIME, mhp.CREATED_TIME) <= t.VALID_CLOSE_TIME -- 未超过有效结案时间（小时数） + WHEN TIMESTAMPDIFF(HOUR, mi.CREATED_TIME, ifnull(mhp.CREATED_TIME,mhp2.CREATED_TIME)) <= t.VALID_CLOSE_TIME -- 未超过有效结案时间（小时数） THEN '1' ELSE '0' -- 0 不做处理 END AS respondItemNumber, -- '及时转项目数' CASE - WHEN TIMESTAMPDIFF(HOUR, mi.CREATED_TIME, mhp.CREATED_TIME) > t.VALID_CLOSE_TIME -- 未超过有效结案时间（小时数） + WHEN TIMESTAMPDIFF(HOUR, mi.CREATED_TIME, ifnull(mhp.CREATED_TIME,mhp2.CREATED_TIME)) > t.VALID_CLOSE_TIME -- 未超过有效结案时间（小时数） THEN '1' ELSE '0' -- 0 不做处理 END AS timeoutItemNumber -- 最终转项目数 FROM meta_epdc_item mi -LEFT JOIN meta_epdc_item_handle_process mhp ON mi.id = mhp.ITEM_ID AND mhp.STATE = 10 AND mhp.DEL_FLAG = 0 - +LEFT JOIN meta_epdc_item_handle_process mhp ON mi.id = mhp.ITEM_ID AND mhp.STATE = 15 AND mhp.DEL_FLAG = 0 +LEFT JOIN meta_epdc_item_handle_process mhp2 ON mi.id = mhp2.ITEM_ID AND mhp2.STATE = 10 AND mhp2.DEL_FLAG = 0 LEFT JOIN meta_epdc_category c ON mi.CATEGORY_CODE = c.CATEGORY_CODE AND mi.DEL_FLAG = '0' LEFT JOIN meta_epdc_kpi_time_limit_item t ON c.id = t.CATEGORY_ID WHERE LEFT(mi.CREATED_TIME, 7) = LEFT(date_sub(NOW(), interval 1 MONTH),7) OR LEFT(mhp.CREATED_TIME, 7) = LEFT(date_sub(NOW(), interval 1 MONTH),7) + OR LEFT(mhp2.CREATED_TIME, 7) = LEFT(date_sub(NOW(), interval 1 MONTH),7) )a GROUP BY a.GRID_ID 0 diff --git a/esua-epdc/kettle-Code/governanceRankingMonth/blow_whistle/更新到展示表/epdc_gr_street_month_new_OVERALL_EVALUATION.ktr b/esua-epdc/kettle-Code/governanceRankingMonth/blow_whistle/更新到展示表/epdc_gr_street_month_new_OVERALL_EVALUATION.ktr index 5937b51b0..e49e53929 100644 --- a/esua-epdc/kettle-Code/governanceRankingMonth/blow_whistle/更新到展示表/epdc_gr_street_month_new_OVERALL_EVALUATION.ktr +++ b/esua-epdc/kettle-Code/governanceRankingMonth/blow_whistle/更新到展示表/epdc_gr_street_month_new_OVERALL_EVALUATION.ktr @@ -573,7 +573,7 @@ dept.ID, dept.name, date_format(date_add(now(),interval -1 month ),'%Y-%m') as MONTH_YEAR, - format(entity.OVERALL_EVALUATION,2) as OVERALL_EVALUATION, + format(entity.OVERALL_EVALUATION,3) as OVERALL_EVALUATION, format(entity.PEOPLE_EVALUATE,3) as PEOPLE_EVALUATE, dept.ALL_DEPT_IDS from @@ -582,7 +582,7 @@ from total.MONTH_YEAR, total.ALL_DEPT_IDS, format(sum(total.PEOPLE_EVALUATE),3) as PEOPLE_EVALUATE, - format(sum(total.PEOPLE_EVALUATE) + sum(total.PEOPLE_MATTERS_SATISFACTION_RATE),2) as OVERALL_EVALUATION + format(sum(total.PEOPLE_EVALUATE) + sum(total.PEOPLE_MATTERS_SATISFACTION_RATE),3) as OVERALL_EVALUATION from (SELECT pe.DEPT_ID, date_format(date_add(now(),interval -1 month ),'%Y-%m') as MONTH_YEAR, diff --git a/esua-epdc/kettle-Code/governanceRankingMonth/blow_whistle/更新到展示表/吹哨-街道月排行表更新转换.ktr b/esua-epdc/kettle-Code/governanceRankingMonth/blow_whistle/更新到展示表/吹哨-街道月排行表更新转换.ktr index 402151ac1..6931e827e 100644 --- a/esua-epdc/kettle-Code/governanceRankingMonth/blow_whistle/更新到展示表/吹哨-街道月排行表更新转换.ktr +++ b/esua-epdc/kettle-Code/governanceRankingMonth/blow_whistle/更新到展示表/吹哨-街道月排行表更新转换.ktr @@ -521,67 +521,54 @@ ID - MONTH_YEAR - CASE_HANDLING - PEOPLE_MATTERS_RESPONSE_RATE - PEOPLE_MATTERS_FINISH_RATE - PEOPLE_MATTERS_SATISFACTION_RATE - BLOWING_MATTERS_HANDING - DEPT_ID - DEPT_NAME - ALL_DEPT_IDS - ALL_DEPT_NAMES - DEL_FLAG - CREATED_BY - CREATED_TIME - UPDATED_BY - UPDATED_TIME - + + + EVENT_PLUS_SCORE N @@ -802,6 +789,10 @@ CASE_HANDLING CASE_HANDLING + + EVENT_PLUS_SCORE + EVENT_PLUS_SCORE + @@ -837,7 +828,8 @@ c.PEOPLE_MATTERS_RESPONSE_RATE, -- 群众反应问题网格响应率 上限为5 c.PEOPLE_MATTERS_FINISH_RATE, -- 群众反应问题网格办结率 上限为5 c.PEOPLE_MATTERS_SATISFACTION_RATE, -- 群众反映问题办理满意率得分 上限为10 - FORMAT(ROUND((c.PEOPLE_MATTERS_RESPONSE_RATE + c.PEOPLE_MATTERS_FINISH_RATE + c.CASE_HANDLING_SCORE - IFNULL(kmr.DEDUCTIONS,0)) ,2),2) + ROUND(c.PLUS_SCORE,2) as EVENT_PLUS_SCORE, + FORMAT(ROUND((c.PEOPLE_MATTERS_RESPONSE_RATE + c.PEOPLE_MATTERS_FINISH_RATE + c.CASE_HANDLING_SCORE +c.PLUS_SCORE - IFNULL(kmr.DEDUCTIONS,0)) ,2),2) BLOWING_MATTERS_HANDING, -- 吹哨事项办理 c.DEPT_ID, c.DEPT_NAME, @@ -871,6 +863,7 @@ SELECT END PEOPLE_MATTERS_SATISFACTION_RATE, -- 群众反映问题办理满意率得分 上限为10 format(IFNULL(ch.CASE_HANDLING_SCORE,'0.000'),3) as CASE_HANDLING_SCORE, +format(IFNULL(ch.PLUS_SCORE,'0.00'),3) as PLUS_SCORE, streetBase.STREET_ID DEPT_ID, t1.name DEPT_NAME, t1.ALL_DEPT_IDS, @@ -890,7 +883,7 @@ FROM ( CASE WHEN SUM(gridBase.ITEM_NUM) <= 0 THEN 0.00 ELSE - FORMAT(ROUND(SUM(gridBase.FINISH_IN_TIME_NUM) / SUM(gridBase.ITEM_NUM) * 3 + SUM(gridBase.FINISH_IN_TIME_NUM + gridBase.TIMEOUT_FINISH_NUM) / SUM(gridBase.ITEM_NUM) * 2, 2),2) + FORMAT(ROUND(SUM(gridBase.FINISH_IN_TIME_NUM) / SUM(gridBase.ITEM_NUM) * 2 + SUM(gridBase.FINISH_IN_TIME_NUM + gridBase.TIMEOUT_FINISH_NUM) / SUM(gridBase.ITEM_NUM) * 2, 2),2) END PEOPLE_MATTERS_FINISH_RATE, -- 群众反应问题网格办结率 上限为5 CASE @@ -989,6 +982,29 @@ LEFT JOIN ( Asia/Shanghai N + + String + normal + CASE_HANDLING + 75 + -1 + 表输入 + CASE_HANDLING + + . + , + + none + N + Y + 0 + N + N + N + zh_CN + Asia/Shanghai + N + String normal diff --git a/esua-epdc/kettle-Code/governanceRankingMonth/blow_whistle/更新到展示表/吹哨事项办理定时更新-月.kjb b/esua-epdc/kettle-Code/governanceRankingMonth/blow_whistle/更新到展示表/吹哨事项办理定时更新-月.kjb index 4c3a5adcd..e63833f61 100644 --- a/esua-epdc/kettle-Code/governanceRankingMonth/blow_whistle/更新到展示表/吹哨事项办理定时更新-月.kjb +++ b/esua-epdc/kettle-Code/governanceRankingMonth/blow_whistle/更新到展示表/吹哨事项办理定时更新-月.kjb @@ -471,8 +471,8 @@ SET IFNULL( PUBLIC_OPINION, 0 ) + -- 舆论引导 IFNULL( TYPICAL_CASE, 0 ) + -- 典型培树 IFNULL( OVERALL_EVALUATION, 0 ), - 2 ), - 2 ) -- 群众评价 + 3 ), + 3 ) -- 群众评价 WHERE MONTH_YEAR = LEFT(date_sub(NOW(), interval 1 MONTH),7) F F @@ -670,8 +670,8 @@ WHERE MONTH_YEAR = LEFT(date_sub(NOW(), interval 1 MONTH),7) 0 0 Y - Y - N + N + Y diff --git a/esua-epdc/kettle-Code/governanceRankingMonth/epdc_org_improvement_record_middle/epdc_org_improvement_record.ktr b/esua-epdc/kettle-Code/governanceRankingMonth/epdc_org_improvement_record_middle/epdc_org_improvement_record.ktr index 83d4499dd..fc6091bbb 100644 --- a/esua-epdc/kettle-Code/governanceRankingMonth/epdc_org_improvement_record_middle/epdc_org_improvement_record.ktr +++ b/esua-epdc/kettle-Code/governanceRankingMonth/epdc_org_improvement_record_middle/epdc_org_improvement_record.ktr @@ -669,21 +669,21 @@ esua_epdc_analysis select - a.DEPT_ID, - a.DEPT_NAME, + comdept.id as DEPT_ID, + comdept.name as DEPT_NAME, DATE_FORMAT(DATE_ADD(now(),interval - 1 month),'%Y-%m') as MONTH_YEAR, - max(case RESOURCE_CODE when 11 then total else 0 end)GRASSROOTS_THREE_SESSIONS - ,max(case RESOURCE_CODE when 12 then total else 0 end)GRASSROOTS_THEME_PARTY_DAY - ,max(case RESOURCE_CODE when 13 then total else 0 end)GRASSROOTS_THREE_TOPICS - ,max(case RESOURCE_CODE when 14 then total else 0 end)GRASSROOTS_VOLUNTEER_SERVICE - ,max(case RESOURCE_CODE when 30 then total else 0 end)GRASSROOTS_SERVE_PEOPLE - ,max(case RESOURCE_CODE when 15 then total else 0 end)GRASSROOTS_CONDOLENCES_MASSES - ,max(case RESOURCE_CODE when 17 then total else 0 end)GRASSROOTS_VISIT_COMPANY - ,max(case RESOURCE_CODE when 40 then total else 0 end)GRASSROOTS_ORGANIZE_ACTIVITY - ,max(case RESOURCE_CODE when 21 then total else 0 end)CO_RESIDENT_PROVINCES_CITY - ,max(case RESOURCE_CODE when 22 then total else 0 end)CO_RESIDENT_AREA - ,max(case RESOURCE_CODE when 23 then total else 0 end)CO_RESIDENT_INSTITUTION - ,max(case RESOURCE_CODE when 24 then total else 0 end)CO_RESIDENT_TWO_NEW_ORG, + max(case RESOURCE_CODE when 11 then a.total else 0 end)GRASSROOTS_THREE_SESSIONS + ,max(case RESOURCE_CODE when 12 then a.total else 0 end)GRASSROOTS_THEME_PARTY_DAY + ,max(case RESOURCE_CODE when 13 then a.total else 0 end)GRASSROOTS_THREE_TOPICS + ,max(case RESOURCE_CODE when 14 then a.total else 0 end)GRASSROOTS_VOLUNTEER_SERVICE + ,max(case RESOURCE_CODE when 30 then a.total else 0 end)GRASSROOTS_SERVE_PEOPLE + ,max(case RESOURCE_CODE when 15 then a.total else 0 end)GRASSROOTS_CONDOLENCES_MASSES + ,max(case RESOURCE_CODE when 17 then a.total else 0 end)GRASSROOTS_VISIT_COMPANY + ,max(case RESOURCE_CODE when 40 then a.total else 0 end)GRASSROOTS_ORGANIZE_ACTIVITY + ,max(case RESOURCE_CODE when 21 then a.total else 0 end)CO_RESIDENT_PROVINCES_CITY + ,max(case RESOURCE_CODE when 22 then a.total else 0 end)CO_RESIDENT_AREA + ,max(case RESOURCE_CODE when 23 then a.total else 0 end)CO_RESIDENT_INSTITUTION + ,max(case RESOURCE_CODE when 24 then a.total else 0 end)CO_RESIDENT_TWO_NEW_ORG, REPLACE(MD5(UUID()), '-', '') as ID, now() as CREATED_TIME, 'admin' as CREATED_BY, @@ -691,15 +691,17 @@ now() as UPDATED_TIME, 0 as DEL_FLAG, 0 as REVISION -from ( +from meta_sys_dept comdept + + left join ( select if(msd.TYPE_KEY='community_party',t1.DEPT_ID ,psd.ID) as DEPT_ID, if(msd.TYPE_KEY='community_party',t1.DEPT_NAME ,psd.NAME) as DEPT_NAME, sum(t2.TOTAL) as total,t3.RESOURCE_CODE, if(msd.TYPE_KEY='community_party',msd.ID ,psd.ID) as msdID - from meta_epdc_week_record_info t1 - left join meta_sys_dept msd on msd.ID = t1.DEPT_ID - left join meta_sys_dept psd on msd.PID=psd.ID + from meta_sys_dept psd + left join meta_sys_dept msd on msd.PID=psd.ID + left join meta_epdc_week_record_info t1 on msd.ID = t1.DEPT_ID left join meta_epdc_week_record_detail t2 on t1.ID = t2.INFO_ID and t2.DEL_FLAG = '0' left join meta_epdc_resources_dictionary t3 on t2.RESOURCE_ID = t3.ID and t3.DEL_FLAG = '0' left join meta_epdc_total_config mtc on t2.TOTAL_CONFIG_ID = mtc.id and mtc.DEL_FLAG = '0' @@ -707,8 +709,9 @@ select and (psd.TYPE_KEY='community_party' or msd.TYPE_KEY='community_party') and mtc.TOTAL_STYLE = 1 and DATE_FORMAT(t1.END_DATE,'%Y-%m') = DATE_FORMAT(DATE_ADD(now(),interval -1 month),'%Y-%m') and msd.DEL_FLAG ='0' - group by t3.RESOURCE_CODE,if(msd.TYPE_KEY='community_party',t1.DEPT_ID ,psd.ID))a - group by a.DEPT_ID; + group by t3.RESOURCE_CODE,if(msd.TYPE_KEY='community_party',t1.DEPT_ID ,psd.ID))a on comdept.id = a.DEPT_ID + where comdept.DEL_FLAG = '0' and comdept.TYPE_KEY='community_party' and id not in(1191535301279203329,1201687651826360321) + group by comdept.id; 0 N @@ -717,14 +720,14 @@ select N - String + Integer normal DEPT_ID - 32 - -1 + 15 + 0 表输入 DEPT_ID - + ####0;-####0 . , @@ -743,7 +746,7 @@ select String normal DEPT_NAME - 128 + 50 -1 表输入 DEPT_NAME @@ -786,14 +789,14 @@ select N - Number + Integer normal GRASSROOTS_THREE_SESSIONS - -1 - -1 + 15 + 0 表输入 GRASSROOTS_THREE_SESSIONS - ####0.0#########;-####0.0######### + ####0;-####0 . , @@ -809,14 +812,14 @@ select N - Number + Integer normal GRASSROOTS_THEME_PARTY_DAY - -1 - -1 + 15 + 0 表输入 GRASSROOTS_THEME_PARTY_DAY - ####0.0#########;-####0.0######### + ####0;-####0 . , @@ -832,14 +835,14 @@ select N - Number + Integer normal GRASSROOTS_THREE_TOPICS - -1 - -1 + 15 + 0 表输入 GRASSROOTS_THREE_TOPICS - ####0.0#########;-####0.0######### + ####0;-####0 . , @@ -855,14 +858,14 @@ select N - Number + Integer normal GRASSROOTS_VOLUNTEER_SERVICE - -1 - -1 + 15 + 0 表输入 GRASSROOTS_VOLUNTEER_SERVICE - ####0.0#########;-####0.0######### + ####0;-####0 . , @@ -878,14 +881,14 @@ select N - Number + Integer normal GRASSROOTS_SERVE_PEOPLE - -1 - -1 + 15 + 0 表输入 GRASSROOTS_SERVE_PEOPLE - ####0.0#########;-####0.0######### + ####0;-####0 . , @@ -901,14 +904,14 @@ select N - Number + Integer normal GRASSROOTS_CONDOLENCES_MASSES - -1 - -1 + 15 + 0 表输入 GRASSROOTS_CONDOLENCES_MASSES - ####0.0#########;-####0.0######### + ####0;-####0 . , @@ -970,14 +973,14 @@ select N - Number + Integer normal CO_RESIDENT_PROVINCES_CITY - -1 - -1 + 15 + 0 表输入 CO_RESIDENT_PROVINCES_CITY - ####0.0#########;-####0.0######### + ####0;-####0 . , @@ -993,14 +996,14 @@ select N - Number + Integer normal CO_RESIDENT_AREA - -1 - -1 + 15 + 0 表输入 CO_RESIDENT_AREA - ####0.0#########;-####0.0######### + ####0;-####0 . , @@ -1016,14 +1019,14 @@ select N - Number + Integer normal CO_RESIDENT_INSTITUTION - -1 - -1 + 15 + 0 表输入 CO_RESIDENT_INSTITUTION - ####0.0#########;-####0.0######### + ####0;-####0 . , @@ -1039,14 +1042,14 @@ select N - Number + Integer normal CO_RESIDENT_TWO_NEW_ORG - -1 - -1 + 15 + 0 表输入 CO_RESIDENT_TWO_NEW_ORG - ####0.0#########;-####0.0######### + ####0;-####0 . , diff --git a/esua-epdc/kettle-Code/governanceRankingMonth/organization/base_and_common/epdc_gr_street_month_new_GRID_ENTITY_OPERATION.ktr b/esua-epdc/kettle-Code/governanceRankingMonth/organization/base_and_common/epdc_gr_street_month_new_GRID_ENTITY_OPERATION.ktr index 8ee0f7807..1115a044f 100644 --- a/esua-epdc/kettle-Code/governanceRankingMonth/organization/base_and_common/epdc_gr_street_month_new_GRID_ENTITY_OPERATION.ktr +++ b/esua-epdc/kettle-Code/governanceRankingMonth/organization/base_and_common/epdc_gr_street_month_new_GRID_ENTITY_OPERATION.ktr @@ -582,6 +582,10 @@ GRID_OPERATION_OPERATIONAL GRID_OPERATION_OPERATIONAL + + GRID_PLUS_SCORE + GRID_PLUS_SCORE + @@ -614,7 +618,7 @@ street.name, date_format( date_add( now( ), INTERVAL - 1 MONTH ), '%Y-%m' ) as MONTH_YEAR, -- IFNULL(entity.MONTH_YEAR,kge.MONTH_YEAR) as MONTH_YEAR, - IFNULL(format(kge.STATION_ESTABLISHMENT + kge.STAFFING_PLACEMENT + kge.GRID_OPERATION,2),format(round(sum(entity.GRID_ENTITY_OPERATION)/ + IFNULL(format(kge.STATION_ESTABLISHMENT + kge.STAFFING_PLACEMENT + kge.GRID_OPERATION + format(IFNULL(kge.PLUS_SCORE,'0.00'),3),2),format(round(sum(entity.GRID_ENTITY_OPERATION)/ (select count(grid.id) from meta_sys_dept grid left join meta_sys_dept dept on dept.ID=grid.PID @@ -711,6 +715,7 @@ left join meta_sys_dept st on st.ID=dept.PID where st.ID=street.ID and grid.DEL_FLAG=0) ,2),2)) as GRID_OPERATION_OPERATIONAL, + format(IFNULL(kge.PLUS_SCORE,'0.00'),2) AS GRID_PLUS_SCORE, street.ALL_DEPT_IDS from meta_sys_dept street @@ -1104,6 +1109,29 @@ from Asia/Shanghai N + + String + normal + GRID_PLUS_SCORE + 75 + -1 + 表输入 + GRID_PLUS_SCORE + + . + , + + none + N + Y + 0 + N + N + N + zh_CN + Asia/Shanghai + N + String normal diff --git a/esua-epdc/kettle-Code/governanceRankingMonth/organization/base_and_common/street_month_new.kjb b/esua-epdc/kettle-Code/governanceRankingMonth/organization/base_and_common/street_month_new.kjb index 48c153706..4b94a1ca5 100644 --- a/esua-epdc/kettle-Code/governanceRankingMonth/organization/base_and_common/street_month_new.kjb +++ b/esua-epdc/kettle-Code/governanceRankingMonth/organization/base_and_common/street_month_new.kjb @@ -417,7 +417,7 @@ SET ORGANIZATION_IMPROVEMENT = FORMAT(ROUND(IFNULL( BASE_PARTY_BUILDING, 0 ) + - IFNULL( COMMUNITY_BUILDING, 0 )+ -- 社区建设 IFNULL( PUBLIC_OPINION, 0 )+ -- 舆论引导 IFNULL( TYPICAL_CASE, 0 )+ -- 典型培树 - IFNULL( OVERALL_EVALUATION, 0 ),2),2) -- 群众评价 + IFNULL( OVERALL_EVALUATION, 0 ),3),3) -- 群众评价 WHERE MONTH_YEAR = DATE_FORMAT( DATE_ADD( now( ), INTERVAL - 1 MONTH ), '%Y-%m' ) F F diff --git a/esua-epdc/pom.xml b/esua-epdc/pom.xml index 0dbfb3901..c11480983 100644 --- a/esua-epdc/pom.xml +++ b/esua-epdc/pom.xml @@ -130,7 +130,7 @@ elink-release aliyun nexus - http://47.104.224.45:9002/repository/maven-public/ + http://maven.aliyun.com/nexus/content/groups/public/ true @@ -156,7 +156,7 @@ public aliyun nexus - http://47.104.224.45:9002/repository/maven-public/ + http://maven.aliyun.com/nexus/content/groups/public/ true