elink-star
/
esua-epdc-cloud
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

【代码提交】

feature/dangjian
李鹏飞 4 years ago
parent
7240d50711
commit
5eae801883
33 changed files with 390 additions and 183 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/SysUserAnalysisOpenIdFormDTO.java
  2. 2
      esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/SysUserOpenIdFormDTO.java
  3. 17
      esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/rocketmq/dto/OrganizationModifyDTO.java
  4. 2
      esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysAnalysisMenuServiceImpl.java
  5. 23
      esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java
  6. 7
      esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysUserDao.xml
  7. 2
      esua-epdc/epdc-auth/src/main/java/com/elink/esua/epdc/controller/AuthController.java
  8. 4
      esua-epdc/epdc-auth/src/main/java/com/elink/esua/epdc/service/impl/AuthServiceImpl.java
  9. 2
      esua-epdc/epdc-auth/src/main/resources/application.yml
  10. 1
      esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/WorkUserServiceImpl.java
  11. 2
      esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/resources/application.yml
  12. 3
      esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/evaluate/EvaluateOfficerDao.xml
  13. 2
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/dao/EpdcEventsDao.java
  14. 52
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java
  15. 52
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueServiceImpl.java
  16. 52
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java
  17. 18
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/rocketmq/dto/OrganizationModifyDTO.java
  18. 2
      esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcWorkUserFromDTO.java
  19. 41
      esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/redis/UserRedis.java
  20. 13
      esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java
  21. 2
      esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml
  22. 14
      esua-epdc/kettle-Code/esua_epdc_analysis_job/analysis_synchronize/epdc_item.ktr
  23. 5
      esua-epdc/kettle-Code/esua_epdc_analysis_job/analysis_synchronize/epdc_kpi_case_handling.ktr
  24. 5
      esua-epdc/kettle-Code/esua_epdc_analysis_job/analysis_synchronize/epdc_kpi_grid_entity.ktr
  25. 4
      esua-epdc/kettle-Code/esua_epdc_behavior/behavior.kjb
  26. 9
      esua-epdc/kettle-Code/governanceRankingMonth/blow_whistle/同步到中间表/吹哨-项目-月-基础数据.ktr
  27. 4
      esua-epdc/kettle-Code/governanceRankingMonth/blow_whistle/更新到展示表/epdc_gr_street_month_new_OVERALL_EVALUATION.ktr
  28. 52
      esua-epdc/kettle-Code/governanceRankingMonth/blow_whistle/更新到展示表/吹哨-街道月排行表更新转换.ktr
  29. 8
      esua-epdc/kettle-Code/governanceRankingMonth/blow_whistle/更新到展示表/吹哨事项办理定时更新-月.kjb
  30. 133
      esua-epdc/kettle-Code/governanceRankingMonth/epdc_org_improvement_record_middle/epdc_org_improvement_record.ktr
  31. 30
      esua-epdc/kettle-Code/governanceRankingMonth/organization/base_and_common/epdc_gr_street_month_new_GRID_ENTITY_OPERATION.ktr
  32. 2
      esua-epdc/kettle-Code/governanceRankingMonth/organization/base_and_common/street_month_new.kjb
  33. 4
      esua-epdc/pom.xml

4
esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/SysUserAnalysisOpenIdFormDTO.java
View File

@ -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;
}
}

2
esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/SysUserOpenIdFormDTO.java
View File

@ -20,7 +20,7 @@ public class SysUserOpenIdFormDTO implements Serializable {
* 用户名
*/
@NotBlank(message = "用户名不能为空")
private String username;
private String userId;
/**
* 微信openId

17
esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/rocketmq/dto/OrganizationModifyDTO.java
View File

@ -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;
}

2
esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysAnalysisMenuServiceImpl.java
View File

@ -159,4 +159,4 @@ public class SysAnalysisMenuServiceImpl extends BaseServiceImpl<SysAnalysisMenuD
return new Result().ok(list);
}
}
}

23
esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java
View File

@ -1092,15 +1092,20 @@ public class SysDeptServiceImpl extends BaseServiceImpl<SysDeptDao, SysDeptEntit
private void sendMqMessage(SysDeptDTO dto) {
// 获取旧信息
SysDeptEntity entity = baseDao.getById(dto.getId());
if (!dto.getName().equals(entity.getName())) {
OrganizationModifyDTO body = new OrganizationModifyDTO();
body.setDeptId(dto.getId());
body.setOldDeptName(entity.getName());
body.setNewDeptName(dto.getName());
body.setTypeKey(entity.getTypeKey());
organizationModifyProducer.sendMessage(RocketMqConstant.MQ_TOPIC_ORGANIZATION, RocketMqConstant.MQ_TAG_ORGANIZATION,
dto.getId().toString(), JSONObject.toJSONString(body));
}
CompleteDeptDTO completeDept = this.baseDao.getParentAndAllDept(dto.getId());
OrganizationModifyDTO body = new OrganizationModifyDTO();
body.setDeptId(dto.getId());
body.setOldDeptName(entity.getName());
body.setNewDeptName(dto.getName());
body.setTypeKey(entity.getTypeKey());
body.setParentDeptIds(entity.getPids());
body.setAllDeptIds(entity.getPids() + "," + entity.getId());
String allDeptNames = (completeDept.getDistrictId() !=null ? completeDept.getDistrict() + "-":"") + (completeDept.getStreetId() !=null ? completeDept.getStreet() + "-":"") + (completeDept.getCommunityId() !=null ? completeDept.getCommunity() + "-":"") + (completeDept.getGridId() !=null ? completeDept.getGrid() :"");
String parentDeptNames = (completeDept.getDistrictId() !=null ? completeDept.getDistrict() + "-":"") + (completeDept.getStreetId() !=null ? completeDept.getStreet() + "-":"") + (completeDept.getCommunityId() !=null ? completeDept.getCommunity():"");
body.setAllDeptNames(allDeptNames);
body.setParentDeptNames(parentDeptNames);
organizationModifyProducer.sendMessage(RocketMqConstant.MQ_TOPIC_ORGANIZATION, RocketMqConstant.MQ_TAG_ORGANIZATION,
dto.getId().toString(), JSONObject.toJSONString(body));
}
@Override

7
esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysUserDao.xml
View File

@ -64,7 +64,8 @@
sys_user u
LEFT JOIN sys_dept d ON u.dept_id = d.id
WHERE
u.username = #{value} AND u.del_flag = 0
u.del_flag = 0
AND (u.username = #{value} or u.mobile = #{value})
</select>
<update id="updatePassword">
@ -128,11 +129,11 @@
</select>
<update id="updateOpenIdByUsername">
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>
<update id="updateAnalysisOpenIdByUsername">
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
</update>
<update id="updateUserOpenId">

2
esua-epdc/epdc-auth/src/main/java/com/elink/esua/epdc/controller/AuthController.java
View File

@ -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);
}

4
esua-epdc/epdc-auth/src/main/java/com/elink/esua/epdc/service/impl/AuthServiceImpl.java
View File

@ -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<WorkUserAuthorizationDTO>().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<AnalysisUserAuthorizationDTO>().ok(authorization);

2
esua-epdc/epdc-auth/src/main/resources/application.yml
View File

@ -69,4 +69,4 @@ jwt:
#秘钥
secret: 7016867071f0ebf1c46f123eaaf4b9d6[elink.epdc]
#token有效时长，默认7天，单位秒
expire: 604800
expire: 31536000

1
esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/WorkUserServiceImpl.java
View File

@ -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);
}

2
esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/resources/application.yml
View File

@ -186,7 +186,7 @@ wx:
token:
expire: 21600
expire: 604800
jwt:
token:

3
esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/evaluate/EvaluateOfficerDao.xml
View File

@ -38,6 +38,7 @@
UPDATED_TIME
from epdc_evaluate_officer
where DEL_FLAG = '0'
<if test="id != null and id != ''">
and ID like '%' #{id} '%'
</if>
@ -294,4 +295,4 @@
LIMIT #{pageIndex},#{pageSize}
</select>
</mapper>
</mapper>

2
esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/dao/EpdcEventsDao.java
View File

@ -174,7 +174,7 @@ public interface EpdcEventsDao extends BaseDao<EpdcEventsEntity> {
/**
*
* 查询需要修改组织机构信息事件
*
* @params [deptId]
* @return java.util.List<com.elink.esua.epdc.dto.events.EpdcEventsDTO>
* @author liuchuang

52
esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java
View File

@ -695,27 +695,47 @@ public class EpdcEventsServiceImpl extends BaseServiceImpl<EpdcEventsDao, EpdcEv
List<EpdcEventsEntity> entities = new ArrayList<>();
for (EpdcEventsDTO events: eventsList) {
EpdcEventsEntity entity = new EpdcEventsEntity();
if (StringUtils.isNotEmpty(events.getParentDeptIds()) && StringUtils.isNotEmpty(events.getParentDeptNames())) {
List<String> parentDeptIds = Arrays.asList(events.getParentDeptIds().split(","));
List<String> 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<String> allDeptIds = Arrays.asList(events.getAllDeptIds().split(","));
List<String> 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<String> parentDeptIds = Arrays.asList(events.getParentDeptIds().split(","));
// List<String> 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<String> allDeptIds = Arrays.asList(events.getAllDeptIds().split(","));
// List<String> 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);
}

52
esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueServiceImpl.java
View File

@ -558,27 +558,47 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
List<IssueEntity> entities = new ArrayList<>();
for (IssueDTO issue: issueList) {
IssueEntity entity = new IssueEntity();
if (StringUtils.isNotEmpty(issue.getParentDeptIds()) && StringUtils.isNotEmpty(issue.getParentDeptNames())) {
List<String> parentDeptIds = Arrays.asList(issue.getParentDeptIds().split(","));
List<String> 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<String> allDeptIds = Arrays.asList(issue.getAllDeptIds().split(","));
List<String> 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<String> parentDeptIds = Arrays.asList(issue.getParentDeptIds().split(","));
// List<String> 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<String> allDeptIds = Arrays.asList(issue.getAllDeptIds().split(","));
// List<String> 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);
}

52
esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java
View File

@ -1821,27 +1821,47 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
List<ItemEntity> entities = new ArrayList<>();
for (ItemDTO item: itemList) {
ItemEntity entity = new ItemEntity();
if (StringUtils.isNotEmpty(item.getParentDeptIds()) && StringUtils.isNotEmpty(item.getParentDeptNames())) {
List<String> parentDeptIds = Arrays.asList(item.getParentDeptIds().split(","));
List<String> 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<String> allDeptIds = Arrays.asList(item.getAllDeptIds().split(","));
List<String> 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<String> parentDeptIds = Arrays.asList(item.getParentDeptIds().split(","));
// List<String> 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<String> allDeptIds = Arrays.asList(item.getAllDeptIds().split(","));
// List<String> 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);
}

18
esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/rocketmq/dto/OrganizationModifyDTO.java
View File

@ -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;
}

2
esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcWorkUserFromDTO.java
View File

@ -33,6 +33,8 @@ public class EpdcWorkUserFromDTO implements Serializable {
*/
private Long gridId;
private Long userId;
/**
* 页码
*/

41
esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/redis/UserRedis.java
View File

@ -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<EpdcWorkUserResultDTO> 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<EpdcWorkUserResultDTO> 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<EpdcWorkUserResultDTO> list = castList(data,EpdcWorkUserResultDTO.class);
return list;
}
public static <T> List<T> castList(Object obj, Class<T> clazz)
{
List<T> result = new ArrayList<T>();
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;
}
}
}

13
esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java
View File

@ -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<UserDao, UserEntity> implem
@Autowired
private AdminFeignClient adminFeignClient;
@Autowired
private UserRedis userRedis;
@Override
@DataSource(value = DataSourceNames.FIRST)
public PageData<UserDTO> page(Map<String, Object> params) {
@ -1075,8 +1080,13 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
String partyFlag = workUserFromDto.getPartyFlag();
String authenticatedFlag = workUserFromDto.getAuthenticatedFlag();
// 修改于2020-06-08：目的是与 PC 端数据保持一致
List<EpdcWorkUserResultDTO> epdcWorkUserResultDTOS = new ArrayList<EpdcWorkUserResultDTO>();
List<EpdcWorkUserResultDTO> epdcWorkUserResultDTOS;
epdcWorkUserResultDTOS = userRedis.getworkUserList(workUserFromDto.getUserId(),partyFlag,authenticatedFlag,pageIndex,workUserFromDto.getPageSize());
if (epdcWorkUserResultDTOS !=null && epdcWorkUserResultDTOS.size() > 0) {
return new Result<List<EpdcWorkUserResultDTO>>().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<UserDao, UserEntity> implem
// 党员认证失败
epdcWorkUserResultDTOS = baseDao.selectAppPartyAuthenticationFailedList(workUserFromDto);
}
userRedis.set(epdcWorkUserResultDTOS,workUserFromDto.getUserId(),partyFlag,authenticatedFlag,pageIndex,workUserFromDto.getPageSize(),3600);
return new Result<List<EpdcWorkUserResultDTO>>().ok(epdcWorkUserResultDTOS);
/*// 查询认证成的居民或党员

2
esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml
View File

@ -428,7 +428,7 @@
WHERE
u.DEL_FLAG = '0'
<if test="wxOpenId != null and wxOpenId !=''">AND u.WX_OPEN_ID = #{wxOpenId}</if>
<if test="wxUnionId != null and wxUnionId !=''">AND u.WX_UNION_ID = #{wxUnionId}</if>
<!-- <if test="wxUnionId != null and wxUnionId !=''">AND u.WX_UNION_ID = #{wxUnionId}</if>-->
ORDER BY
ur.SWITCHED_TIME DESC
</select>

14
esua-epdc/kettle-Code/esua_epdc_analysis_job/analysis_synchronize/epdc_item.ktr
View File

@ -804,20 +804,12 @@
<connection>esua_epdc_events</connection>
<rowlimit>0</rowlimit>
<sql>SELECT * FROM epdc_item
WHERE (UPDATED_TIME > ?
AND UPDATED_TIME &lt;= ?) or del_flag=1
WHERE (UPDATED_TIME > '2021-07-08 09:53:57'
AND UPDATED_TIME &lt;= '2021-07-09 00:00:29') or del_flag=1
</sql>
<outer_join>N</outer_join>
<replace_vars>N</replace_vars>
<parameter>
<field>
<name>START_TIME</name>
<type>Date</type>
</field>
<field>
<name>END_TIME</name>
<type>Date</type>
</field>
</parameter>
<attributes/>
<cluster_schema/>
@ -847,7 +839,7 @@
<connection>esua_epdc_analysis</connection>
<sql>
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

5
esua-epdc/kettle-Code/esua_epdc_analysis_job/analysis_synchronize/epdc_kpi_case_handling.ktr
View File

@ -670,6 +670,11 @@
<rename>DEL_FLAG</rename>
<update>Y</update>
</value>
<value>
<name>PLUS_SCORE</name>
<rename>PLUS_SCORE</rename>
<update>Y</update>
</value>
</lookup>
<attributes/>
<cluster_schema/>

5
esua-epdc/kettle-Code/esua_epdc_analysis_job/analysis_synchronize/epdc_kpi_grid_entity.ktr
View File

@ -715,6 +715,11 @@
<rename>DEL_FLAG</rename>
<update>Y</update>
</value>
<value>
<name>PLUS_SCORE</name>
<rename>PLUS_SCORE</rename>
<update>Y</update>
</value>
</lookup>
<attributes/>
<cluster_schema/>

4
esua-epdc/kettle-Code/esua_epdc_behavior/behavior.kjb
View File

@ -294,8 +294,8 @@
<attributes/>
<start>Y</start>
<dummy>N</dummy>
<repeat>Y</repeat>
<schedulerType>2</schedulerType>
<repeat>N</repeat>
<schedulerType>0</schedulerType>
<intervalSeconds>0</intervalSeconds>
<intervalMinutes>60</intervalMinutes>
<hour>3</hour>

9
esua-epdc/kettle-Code/governanceRankingMonth/blow_whistle/同步到中间表/吹哨-项目-月-基础数据.ktr
View File

@ -631,23 +631,24 @@ SELECT
mi.GRID_ID,
CASE
-- 已结案的项目时间 减去 项目的创建时间 小于等于 有效时间
WHEN TIMESTAMPDIFF(HOUR, mi.CREATED_TIME, mhp.CREATED_TIME) &lt;= t.VALID_CLOSE_TIME -- 未超过有效结案时间（小时数）
WHEN TIMESTAMPDIFF(HOUR, mi.CREATED_TIME, ifnull(mhp.CREATED_TIME,mhp2.CREATED_TIME)) &lt;= 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 </sql>
<limit>0</limit>

4
esua-epdc/kettle-Code/governanceRankingMonth/blow_whistle/更新到展示表/epdc_gr_street_month_new_OVERALL_EVALUATION.ktr
View File

@ -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,

52
esua-epdc/kettle-Code/governanceRankingMonth/blow_whistle/更新到展示表/吹哨-街道月排行表更新转换.ktr
View File

@ -521,67 +521,54 @@
<fields>
<field>
<name>ID</name>
<rename/>
</field>
<field>
<name>MONTH_YEAR</name>
<rename/>
</field>
<field>
<name>CASE_HANDLING</name>
<rename/>
</field>
<field>
<name>PEOPLE_MATTERS_RESPONSE_RATE</name>
<rename/>
</field>
<field>
<name>PEOPLE_MATTERS_FINISH_RATE</name>
<rename/>
</field>
<field>
<name>PEOPLE_MATTERS_SATISFACTION_RATE</name>
<rename/>
</field>
<field>
<name>BLOWING_MATTERS_HANDING</name>
<rename/>
</field>
<field>
<name>DEPT_ID</name>
<rename/>
</field>
<field>
<name>DEPT_NAME</name>
<rename/>
</field>
<field>
<name>ALL_DEPT_IDS</name>
<rename/>
</field>
<field>
<name>ALL_DEPT_NAMES</name>
<rename/>
</field>
<field>
<name>DEL_FLAG</name>
<rename/>
</field>
<field>
<name>CREATED_BY</name>
<rename/>
</field>
<field>
<name>CREATED_TIME</name>
<rename/>
</field>
<field>
<name>UPDATED_BY</name>
<rename/>
</field>
<field>
<name>UPDATED_TIME</name>
<rename/>
</field>
<field>
<name>EVENT_PLUS_SCORE</name>
</field>
<select_unspecified>N</select_unspecified>
</fields>
@ -802,6 +789,10 @@
<name>CASE_HANDLING</name>
<rename>CASE_HANDLING</rename>
</value>
<value>
<name>EVENT_PLUS_SCORE</name>
<rename>EVENT_PLUS_SCORE</rename>
</value>
</lookup>
<attributes/>
<cluster_schema/>
@ -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) &lt;= 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 (
<date_format_timezone>Asia/Shanghai</date_format_timezone>
<lenient_string_to_number>N</lenient_string_to_number>
</value-meta>
<value-meta>
<type>String</type>
<storagetype>normal</storagetype>
<name>CASE_HANDLING</name>
<length>75</length>
<precision>-1</precision>
<origin>表输入</origin>
<comments>CASE_HANDLING</comments>
<conversion_Mask/>
<decimal_symbol>.</decimal_symbol>
<grouping_symbol>,</grouping_symbol>
<currency_symbol/>
<trim_type>none</trim_type>
<case_insensitive>N</case_insensitive>
<collator_disabled>Y</collator_disabled>
<collator_strength>0</collator_strength>
<sort_descending>N</sort_descending>
<output_padding>N</output_padding>
<date_format_lenient>N</date_format_lenient>
<date_format_locale>zh_CN</date_format_locale>
<date_format_timezone>Asia/Shanghai</date_format_timezone>
<lenient_string_to_number>N</lenient_string_to_number>
</value-meta>
<value-meta>
<type>String</type>
<storagetype>normal</storagetype>

8
esua-epdc/kettle-Code/governanceRankingMonth/blow_whistle/更新到展示表/吹哨事项办理定时更新-月.kjb
View File

@ -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)</sql>
<useVariableSubstitution>F</useVariableSubstitution>
<sqlfromfile>F</sqlfromfile>
@ -670,8 +670,8 @@ WHERE MONTH_YEAR = LEFT(date_sub(NOW(), interval 1 MONTH),7)</sql>
<from_nr>0</from_nr>
<to_nr>0</to_nr>
<enabled>Y</enabled>
<evaluation>Y</evaluation>
<unconditional>N</unconditional>
<evaluation>N</evaluation>
<unconditional>Y</unconditional>
</hop>
</hops>
<notepads>

133
esua-epdc/kettle-Code/governanceRankingMonth/epdc_org_improvement_record_middle/epdc_org_improvement_record.ktr
View File

@ -669,21 +669,21 @@
</partitioning>
<connection>esua_epdc_analysis</connection>
<sql>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;</sql>
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;</sql>
<limit>0</limit>
<lookup/>
<execute_each_row>N</execute_each_row>
@ -717,14 +720,14 @@ select
<cached_row_meta_active>N</cached_row_meta_active>
<row-meta>
<value-meta>
<type>String</type>
<type>Integer</type>
<storagetype>normal</storagetype>
<name>DEPT_ID</name>
<length>32</length>
<precision>-1</precision>
<length>15</length>
<precision>0</precision>
<origin>表输入</origin>
<comments>DEPT_ID</comments>
<conversion_Mask/>
<conversion_Mask>####0;-####0</conversion_Mask>
<decimal_symbol>.</decimal_symbol>
<grouping_symbol>,</grouping_symbol>
<currency_symbol/>
@ -743,7 +746,7 @@ select
<type>String</type>
<storagetype>normal</storagetype>
<name>DEPT_NAME</name>
<length>128</length>
<length>50</length>
<precision>-1</precision>
<origin>表输入</origin>
<comments>DEPT_NAME</comments>
@ -786,14 +789,14 @@ select
<lenient_string_to_number>N</lenient_string_to_number>
</value-meta>
<value-meta>
<type>Number</type>
<type>Integer</type>
<storagetype>normal</storagetype>
<name>GRASSROOTS_THREE_SESSIONS</name>
<length>-1</length>
<precision>-1</precision>
<length>15</length>
<precision>0</precision>
<origin>表输入</origin>
<comments>GRASSROOTS_THREE_SESSIONS</comments>
<conversion_Mask>####0.0#########;-####0.0#########</conversion_Mask>
<conversion_Mask>####0;-####0</conversion_Mask>
<decimal_symbol>.</decimal_symbol>
<grouping_symbol>,</grouping_symbol>
<currency_symbol/>
@ -809,14 +812,14 @@ select
<lenient_string_to_number>N</lenient_string_to_number>
</value-meta>
<value-meta>
<type>Number</type>
<type>Integer</type>
<storagetype>normal</storagetype>
<name>GRASSROOTS_THEME_PARTY_DAY</name>
<length>-1</length>
<precision>-1</precision>
<length>15</length>
<precision>0</precision>
<origin>表输入</origin>
<comments>GRASSROOTS_THEME_PARTY_DAY</comments>
<conversion_Mask>####0.0#########;-####0.0#########</conversion_Mask>
<conversion_Mask>####0;-####0</conversion_Mask>
<decimal_symbol>.</decimal_symbol>
<grouping_symbol>,</grouping_symbol>
<currency_symbol/>
@ -832,14 +835,14 @@ select
<lenient_string_to_number>N</lenient_string_to_number>
</value-meta>
<value-meta>
<type>Number</type>
<type>Integer</type>
<storagetype>normal</storagetype>
<name>GRASSROOTS_THREE_TOPICS</name>
<length>-1</length>
<precision>-1</precision>
<length>15</length>
<precision>0</precision>
<origin>表输入</origin>
<comments>GRASSROOTS_THREE_TOPICS</comments>
<conversion_Mask>####0.0#########;-####0.0#########</conversion_Mask>
<conversion_Mask>####0;-####0</conversion_Mask>
<decimal_symbol>.</decimal_symbol>
<grouping_symbol>,</grouping_symbol>
<currency_symbol/>
@ -855,14 +858,14 @@ select
<lenient_string_to_number>N</lenient_string_to_number>
</value-meta>
<value-meta>
<type>Number</type>
<type>Integer</type>
<storagetype>normal</storagetype>
<name>GRASSROOTS_VOLUNTEER_SERVICE</name>
<length>-1</length>
<precision>-1</precision>
<length>15</length>
<precision>0</precision>
<origin>表输入</origin>
<comments>GRASSROOTS_VOLUNTEER_SERVICE</comments>
<conversion_Mask>####0.0#########;-####0.0#########</conversion_Mask>
<conversion_Mask>####0;-####0</conversion_Mask>
<decimal_symbol>.</decimal_symbol>
<grouping_symbol>,</grouping_symbol>
<currency_symbol/>
@ -878,14 +881,14 @@ select
<lenient_string_to_number>N</lenient_string_to_number>
</value-meta>
<value-meta>
<type>Number</type>
<type>Integer</type>
<storagetype>normal</storagetype>
<name>GRASSROOTS_SERVE_PEOPLE</name>
<length>-1</length>
<precision>-1</precision>
<length>15</length>
<precision>0</precision>
<origin>表输入</origin>
<comments>GRASSROOTS_SERVE_PEOPLE</comments>
<conversion_Mask>####0.0#########;-####0.0#########</conversion_Mask>
<conversion_Mask>####0;-####0</conversion_Mask>
<decimal_symbol>.</decimal_symbol>
<grouping_symbol>,</grouping_symbol>
<currency_symbol/>
@ -901,14 +904,14 @@ select
<lenient_string_to_number>N</lenient_string_to_number>
</value-meta>
<value-meta>
<type>Number</type>
<type>Integer</type>
<storagetype>normal</storagetype>
<name>GRASSROOTS_CONDOLENCES_MASSES</name>
<length>-1</length>
<precision>-1</precision>
<length>15</length>
<precision>0</precision>
<origin>表输入</origin>
<comments>GRASSROOTS_CONDOLENCES_MASSES</comments>
<conversion_Mask>####0.0#########;-####0.0#########</conversion_Mask>
<conversion_Mask>####0;-####0</conversion_Mask>
<decimal_symbol>.</decimal_symbol>
<grouping_symbol>,</grouping_symbol>
<currency_symbol/>
@ -970,14 +973,14 @@ select
<lenient_string_to_number>N</lenient_string_to_number>
</value-meta>
<value-meta>
<type>Number</type>
<type>Integer</type>
<storagetype>normal</storagetype>
<name>CO_RESIDENT_PROVINCES_CITY</name>
<length>-1</length>
<precision>-1</precision>
<length>15</length>
<precision>0</precision>
<origin>表输入</origin>
<comments>CO_RESIDENT_PROVINCES_CITY</comments>
<conversion_Mask>####0.0#########;-####0.0#########</conversion_Mask>
<conversion_Mask>####0;-####0</conversion_Mask>
<decimal_symbol>.</decimal_symbol>
<grouping_symbol>,</grouping_symbol>
<currency_symbol/>
@ -993,14 +996,14 @@ select
<lenient_string_to_number>N</lenient_string_to_number>
</value-meta>
<value-meta>
<type>Number</type>
<type>Integer</type>
<storagetype>normal</storagetype>
<name>CO_RESIDENT_AREA</name>
<length>-1</length>
<precision>-1</precision>
<length>15</length>
<precision>0</precision>
<origin>表输入</origin>
<comments>CO_RESIDENT_AREA</comments>
<conversion_Mask>####0.0#########;-####0.0#########</conversion_Mask>
<conversion_Mask>####0;-####0</conversion_Mask>
<decimal_symbol>.</decimal_symbol>
<grouping_symbol>,</grouping_symbol>
<currency_symbol/>
@ -1016,14 +1019,14 @@ select
<lenient_string_to_number>N</lenient_string_to_number>
</value-meta>
<value-meta>
<type>Number</type>
<type>Integer</type>
<storagetype>normal</storagetype>
<name>CO_RESIDENT_INSTITUTION</name>
<length>-1</length>
<precision>-1</precision>
<length>15</length>
<precision>0</precision>
<origin>表输入</origin>
<comments>CO_RESIDENT_INSTITUTION</comments>
<conversion_Mask>####0.0#########;-####0.0#########</conversion_Mask>
<conversion_Mask>####0;-####0</conversion_Mask>
<decimal_symbol>.</decimal_symbol>
<grouping_symbol>,</grouping_symbol>
<currency_symbol/>
@ -1039,14 +1042,14 @@ select
<lenient_string_to_number>N</lenient_string_to_number>
</value-meta>
<value-meta>
<type>Number</type>
<type>Integer</type>
<storagetype>normal</storagetype>
<name>CO_RESIDENT_TWO_NEW_ORG</name>
<length>-1</length>
<precision>-1</precision>
<length>15</length>
<precision>0</precision>
<origin>表输入</origin>
<comments>CO_RESIDENT_TWO_NEW_ORG</comments>
<conversion_Mask>####0.0#########;-####0.0#########</conversion_Mask>
<conversion_Mask>####0;-####0</conversion_Mask>
<decimal_symbol>.</decimal_symbol>
<grouping_symbol>,</grouping_symbol>
<currency_symbol/>

30
esua-epdc/kettle-Code/governanceRankingMonth/organization/base_and_common/epdc_gr_street_month_new_GRID_ENTITY_OPERATION.ktr
View File

@ -582,6 +582,10 @@
<name>GRID_OPERATION_OPERATIONAL</name>
<rename>GRID_OPERATION_OPERATIONAL</rename>
</value>
<value>
<name>GRID_PLUS_SCORE</name>
<rename>GRID_PLUS_SCORE</rename>
</value>
</lookup>
<attributes/>
<cluster_schema/>
@ -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
<date_format_timezone>Asia/Shanghai</date_format_timezone>
<lenient_string_to_number>N</lenient_string_to_number>
</value-meta>
<value-meta>
<type>String</type>
<storagetype>normal</storagetype>
<name>GRID_PLUS_SCORE</name>
<length>75</length>
<precision>-1</precision>
<origin>表输入</origin>
<comments>GRID_PLUS_SCORE</comments>
<conversion_Mask/>
<decimal_symbol>.</decimal_symbol>
<grouping_symbol>,</grouping_symbol>
<currency_symbol/>
<trim_type>none</trim_type>
<case_insensitive>N</case_insensitive>
<collator_disabled>Y</collator_disabled>
<collator_strength>0</collator_strength>
<sort_descending>N</sort_descending>
<output_padding>N</output_padding>
<date_format_lenient>N</date_format_lenient>
<date_format_locale>zh_CN</date_format_locale>
<date_format_timezone>Asia/Shanghai</date_format_timezone>
<lenient_string_to_number>N</lenient_string_to_number>
</value-meta>
<value-meta>
<type>String</type>
<storagetype>normal</storagetype>

2
esua-epdc/kettle-Code/governanceRankingMonth/organization/base_and_common/street_month_new.kjb
View File

@ -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' )</sql>
<useVariableSubstitution>F</useVariableSubstitution>
<sqlfromfile>F</sqlfromfile>

4
esua-epdc/pom.xml
View File

@ -130,7 +130,7 @@
<repository>
<id>elink-release</id>
<name>aliyun nexus</name>
<url>http://47.104.224.45:9002/repository/maven-public/</url>
<url>http://maven.aliyun.com/nexus/content/groups/public/</url>
<releases>
<enabled>true</enabled>
</releases>
@ -156,7 +156,7 @@
<pluginRepository>
<id>public</id>
<name>aliyun nexus</name>
<url>http://47.104.224.45:9002/repository/maven-public/</url>
<url>http://maven.aliyun.com/nexus/content/groups/public/</url>
<releases>
<enabled>true</enabled>
</releases>

Write Preview
Loading…
Cancel
Save