diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/controller/EvaluateDeptController.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/controller/EvaluateDeptController.java index eca3acced..436ef758a 100644 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/controller/EvaluateDeptController.java +++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/controller/EvaluateDeptController.java @@ -93,6 +93,11 @@ public class EvaluateDeptController { System.out.println(params); return new Result>().ok(page); } + @GetMapping("deptUpdate") + public Result deptUpdate(){ + evaluateDeptService.deptUpdate(); + return new Result(); + } @GetMapping("countExport") public void countExport(@RequestParam Map params, HttpServletResponse response) throws Exception { List list = evaluateDeptService.countExport(params); diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/dao/EvaluateDeptDao.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/dao/EvaluateDeptDao.java index dda627b08..0383af64b 100644 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/dao/EvaluateDeptDao.java +++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/dao/EvaluateDeptDao.java @@ -48,4 +48,6 @@ public interface EvaluateDeptDao extends BaseDao { * @Date: 2019/9/5 19:42 */ List getEvaluateDeptCount(Map params); + + void deptUpdate(); } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/service/EvaluateDeptService.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/service/EvaluateDeptService.java index b08cf1b24..89ba0f12f 100644 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/service/EvaluateDeptService.java +++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/service/EvaluateDeptService.java @@ -62,6 +62,13 @@ public interface EvaluateDeptService extends BaseService { * @date 2020-02-05 */ List list(Map params); + /** + * 街道同步 + * + * @author generator + * @date 2020-02-05 + */ + void deptUpdate(); /** * 单条查询 diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/service/impl/EvaluateDeptServiceImpl.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/service/impl/EvaluateDeptServiceImpl.java index dfeb171d5..9698de34f 100644 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/service/impl/EvaluateDeptServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/service/impl/EvaluateDeptServiceImpl.java @@ -82,6 +82,11 @@ public class EvaluateDeptServiceImpl extends BaseServiceImpl list = baseDao.getDeptPage(params); return new PageData<>(list, page.getTotal()); } + @Override + @Transactional(rollbackFor = Exception.class) + public void deptUpdate() { + baseDao.deptUpdate(); + } @Override public List list(Map params) { diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/evaluate/EvaluateDeptDao.xml b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/evaluate/EvaluateDeptDao.xml index bc6d4b135..3b33a04a8 100644 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/evaluate/EvaluateDeptDao.xml +++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/evaluate/EvaluateDeptDao.xml @@ -195,4 +195,58 @@ + + INSERT INTO esua_epdc_custom.epdc_evaluate_dept ( + ID, + DEPT_ID, + DEPT_NAME, + PARENT_DEPT_IDS, + PARENT_DEPT_NAMES, + ALL_DEPT_IDS, + ALL_DEPT_NAMES, + OFFICER_COUNT, + DEL_FLAG, + REVISION, + CREATED_BY, + CREATED_TIME, + UPDATED_BY, + UPDATED_TIME + ) SELECT + dept.gridId ID, + dept.gridId DEPT_ID, + dept.grid DEPT_NAME, + dept.communityId PARENT_DEPT_IDS, + dept.community PARENT_DEPT_NAMES, + concat( dept.communityId, ',', dept.gridId ) ALL_DEPT_IDS, + concat( dept.community, '-', dept.grid ) ALL_DEPT_NAMES, + 0 OFFICER_COUNT, + 0 DEL_FLAG, + 1 REVISION, + 'admin' CREATED_BY, + now( ) CREATED_TIME, + 'admin' UPDATED_BY, + now( ) UPDATED_TIME + FROM + ( + SELECT + dis.`name` district, + dis.id districtId, + str.`name` street, + str.id streetId, + com.`name` community, + com.id communityId, + gri.`name` grid, + gri.id gridId + FROM + sys_dept gri + LEFT JOIN sys_dept com ON gri.pid = com.id + LEFT JOIN sys_dept str ON com.pid = str.id + LEFT JOIN sys_dept dis ON str.pid = dis.id + WHERE + gri.del_flag = '0' + AND gri.type_key = 'street_party' + AND gri.id NOT IN ( SELECT id FROM esua_epdc_custom.epdc_evaluate_dept WHERE DEL_FLAG = "0" ) + ) dept + + \ No newline at end of file