diff --git a/src/main/java/com/zhgd/xmgl/modules/baotou/mapper/xml/EngineerControllerCheckMapper.xml b/src/main/java/com/zhgd/xmgl/modules/baotou/mapper/xml/EngineerControllerCheckMapper.xml index 556b5ecf7..a79d194c2 100644 --- a/src/main/java/com/zhgd/xmgl/modules/baotou/mapper/xml/EngineerControllerCheckMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/mapper/xml/EngineerControllerCheckMapper.xml @@ -8,7 +8,6 @@ ,pg.project_group_name as project_group_name ,ei1.enterprise_name as epc_contractor_name ,ei2.enterprise_name as construction_unit_name - ,ei3.enterprise_name as preparing_unit_name ,po1.dept_name as preparing_unit_name ,po2.dept_name as issuing_unit_name ,po3.dept_name as regional_project_team_name @@ -19,7 +18,6 @@ left join project_group pg on pg.id=t.project_group left join enterprise_info ei1 on ei1.id=t.epc_contractor left join enterprise_info ei2 on ei2.id=t.construction_unit - left join enterprise_info ei3 on ei3.id=t.preparing_unit left join xz_project_org po1 on po1.id=t.preparing_unit left join xz_project_org po2 on po2.id=t.issuing_unit left join xz_project_org po3 on po3.id=t.regional_project_team @@ -35,7 +33,6 @@ ,pg.project_group_name as project_group_name ,ei1.enterprise_name as epc_contractor_name ,ei2.enterprise_name as construction_unit_name - ,ei3.enterprise_name as preparing_unit_name ,po1.dept_name as preparing_unit_name ,po2.dept_name as issuing_unit_name ,po3.dept_name as regional_project_team_name @@ -46,7 +43,6 @@ left join project_group pg on pg.id=t.project_group left join enterprise_info ei1 on ei1.id=t.epc_contractor left join enterprise_info ei2 on ei2.id=t.construction_unit - left join enterprise_info ei3 on ei3.id=t.preparing_unit left join xz_project_org po1 on po1.id=t.preparing_unit left join xz_project_org po2 on po2.id=t.issuing_unit left join xz_project_org po3 on po3.id=t.regional_project_team diff --git a/src/main/java/com/zhgd/xmgl/modules/baotou/plan/controller/PlanRecordController.java b/src/main/java/com/zhgd/xmgl/modules/baotou/plan/controller/PlanRecordController.java index 08f521a37..46866983b 100644 --- a/src/main/java/com/zhgd/xmgl/modules/baotou/plan/controller/PlanRecordController.java +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/plan/controller/PlanRecordController.java @@ -158,6 +158,7 @@ public class PlanRecordController { }) @GetMapping(value = "/getPlanShare") public Result> getPlanShare(@RequestParam Map param) { + return Result.success(planRecordService.getPlanShares(param)); }