From a501f87a68b7782506505aa1e32b35cceeac2dbe Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Sun, 5 Dec 2021 15:09:19 +0800 Subject: [PATCH 01/11] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E5=8A=A0=E5=AD=97=E6=AE=B5=20=EF=BC=81=20=E7=99=BD=E5=90=8D?= =?UTF-8?q?=E5=8D=95=E6=B7=BB=E5=8A=A0=E4=B8=80=E4=B8=AA=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../adc/da/login/security/WebMvcConfig.java | 2 ++ .../controller/EsRevisePlanController.java | 21 ++++++++++++++++++- .../entity/StandAttrInfoDto.java | 2 ++ .../SarStandProjectLibraryServiceImpl.java | 5 ++++- .../entity/SarStandardsInfo.java | 4 ++++ 5 files changed, 32 insertions(+), 2 deletions(-) diff --git a/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java b/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java index 3bbea18e..d9051d84 100644 --- a/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java +++ b/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java @@ -85,6 +85,8 @@ public class WebMvcConfig implements WebMvcConfigurer { //调研流程下载接口 addInterceptor.excludePathPatterns("/api/att/attFile/downloadFile"); + addInterceptor.excludePathPatterns("/api/lawss/activiti/exportProcessDetailInfo"); + // //测试接口使用 // addInterceptor.excludePathPatterns("/api/**"); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/controller/EsRevisePlanController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/controller/EsRevisePlanController.java index e9eee749..d327ee5d 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/controller/EsRevisePlanController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/controller/EsRevisePlanController.java @@ -6,6 +6,7 @@ import com.adc.da.http.ResponseMessage; import com.adc.da.http.Result; import com.adc.da.slrs.esRevisePlan.service.IEsRevisePlanService; import io.swagger.annotations.ApiOperation; +import org.apache.ibatis.annotations.Param; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import com.adc.da.slrs.esRevisePlan.entity.EsRevisePlan; @@ -54,7 +55,7 @@ public class EsRevisePlanController extends BaseController { @ApiOperation(value = "获取是否存在重复名企标名称接口") - @GetMapping("getDataByName") + @GetMapping("/getDataByName") public ResponseMessage getDataByName(EsRevisePlan esRevisePlan){ return Result.success(iEsRevisePlanService.getDataByName(esRevisePlan)); } @@ -65,18 +66,36 @@ public class EsRevisePlanController extends BaseController { return Result.success(iEsRevisePlanService.modPlan(esRevisePlan)); } + @ApiOperation(value = "编辑企标计划") + @PostMapping("/modPlanByWk") + public ResponseMessage modPlanByWk(@RequestBody EsRevisePlan esRevisePlan){ + return Result.success(iEsRevisePlanService.modPlan(esRevisePlan)); + } + @ApiOperation(value = "添加企标计划") @PostMapping("addPlan") public ResponseMessage addPlan(EsRevisePlan esRevisePlan){ return Result.success(iEsRevisePlanService.addPlan(esRevisePlan)); } + @ApiOperation(value = "添加企标计划") + @PostMapping("/addPlanByWk") + public ResponseMessage addPlanByWk(@RequestBody EsRevisePlan esRevisePlan){ + return Result.success(iEsRevisePlanService.addPlan(esRevisePlan)); + } + @ApiOperation(value = "删除单个企标计划") @GetMapping("delPlan") public ResponseMessage delPlan(String id){ return Result.success(iEsRevisePlanService.delPlan(id)); } + @ApiOperation(value = "删除单个企标计划") + @GetMapping("delPlanByWk") + public ResponseMessage delPlanByWk(@RequestParam("id") String id){ + return Result.success(iEsRevisePlanService.delPlans(id)); + } + @ApiOperation(value = "批量删除企标计划") @GetMapping("delPlans") public ResponseMessage delPlans(String ids){ diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/StandAttrInfoDto.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/StandAttrInfoDto.java index fb26f972..e6a4db9e 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/StandAttrInfoDto.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/StandAttrInfoDto.java @@ -61,4 +61,6 @@ public class StandAttrInfoDto { private String CYCVPPSCN; private Long unCount; + + private String endTimes; } \ No newline at end of file diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java index b427434a..7ac6049d 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java @@ -379,7 +379,9 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl wrapper1 = new QueryWrapper<>(); wrapper1.select("ID","STAND_NUMBER","STAND_SORT","STAND_YEAR","STAND_NAME","STAND_EN_NAME","STAND_TYPE","(select count(*) from sar_stand_unqualified" + - " where STAND_ID = r.stand_id and CLOSE_STATE = '1' ) as unCount "); + " where STAND_ID = r.stand_id and CLOSE_STATE = '1' ) as unCount ", + "(select GROUP_CONCAT( DISTINCT DATE_FORMAT( PLAN_CLOSE_TIME, '%Y-%m-%d' ) ORDER BY PLAN_CLOSE_TIME ) from sar_stand_unqualified where " + + " STAND_ID = r.stand_id and CLOSE_STATE = '1' AND PLAN_CLOSE_TIME is NOT NULL ) as endTimes "); wrapper1.last("INNER JOIN sar_stand_project_relation r ON r.stand_id = sar_standards_info.ID WHERE r.project_id ='" + standId + "'"); Page page1 = new Page<>(current, pageSize); IPage userIPage1 = SarStandardsInfoDao.selectPage(page1, wrapper1); @@ -407,6 +409,7 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl Date: Sun, 5 Dec 2021 15:50:46 +0800 Subject: [PATCH 02/11] =?UTF-8?q?=E5=88=A0=E9=99=A4=E8=8D=89=E7=A8=BF?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=20api/lawss/activiti/delCG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/adc/da/FeignClient/workFlowFeignClient.java | 3 +++ .../adc/da/FeignClientImpl/workFlowFeignClientImpl.java | 4 ++++ .../adc/da/workFlow/controller/WorkFlowController.java | 8 ++++++++ 3 files changed, 15 insertions(+) diff --git a/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java b/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java index 88a26c51..1a14a949 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java +++ b/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java @@ -408,4 +408,7 @@ public interface workFlowFeignClient { @RequestMapping(value = "/bat-wkflow/datas/bus-process-new/everyDayTenOlockSAM",method = RequestMethod.GET) List everyDayTenOlockSAM(); + + @RequestMapping(value = "/bat-wkflow/delCG",method = RequestMethod.GET) + String delCG(@RequestParam("id") String id); } diff --git a/adc-da-activiti/src/main/java/com/adc/da/FeignClientImpl/workFlowFeignClientImpl.java b/adc-da-activiti/src/main/java/com/adc/da/FeignClientImpl/workFlowFeignClientImpl.java index 80c35fdd..bd7a87ff 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/FeignClientImpl/workFlowFeignClientImpl.java +++ b/adc-da-activiti/src/main/java/com/adc/da/FeignClientImpl/workFlowFeignClientImpl.java @@ -321,4 +321,8 @@ public class workFlowFeignClientImpl { public List queryBusProcessNameForEnd(@RequestBody String prcNum){ return workFlowFeignClient.queryBusProcessNameForEnd(prcNum); } + + public String delCG(@RequestParam("id") String id){ + return workFlowFeignClient.delCG(id); + } } diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java index 134b17ab..4e0b18f7 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java +++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java @@ -687,4 +687,12 @@ public class WorkFlowController { } return Result.success("发送成功"); } + + @ApiOperation(value = "草稿删除") + @GetMapping("/delCG") + public String delCG(@RequestParam("id")String id){ + return workFlowFeignClient.delCG(id); + } + + } From 0e68e431ea15221bd6c991f7f9e74bc9ff94b125 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Sun, 5 Dec 2021 20:25:49 +0800 Subject: [PATCH 03/11] =?UTF-8?q?=E4=B8=BA=E7=AC=A6=E5=90=88=E9=A1=B9=20?= =?UTF-8?q?=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/sarStandUnqualified/SarStandUnqualifiedMapper.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandUnqualified/SarStandUnqualifiedMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandUnqualified/SarStandUnqualifiedMapper.xml index 305cb1c0..a0970a42 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandUnqualified/SarStandUnqualifiedMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandUnqualified/SarStandUnqualifiedMapper.xml @@ -52,6 +52,7 @@ and STAND_SERIAL_NUMBER like concat(concat('%',#{sar.standSerialNumber}),'%') or sar_stand_unqualified.STAND_NAME like concat(concat('%',#{sar.standSerialNumber}),'%') + order by sar_stand_unqualified.STAND_ID ,sar_stand_unqualified.ITEMS_NUM asc limit #{start},#{end} From 4478fecf7330bc9346efcee8e810324d6d837665 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Mon, 6 Dec 2021 09:45:36 +0800 Subject: [PATCH 04/11] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=B8=85=E5=8D=95=20?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=AD=97=E6=AE=B5=E7=AC=A6=E5=90=88-?= =?UTF-8?q?=E6=9C=AA=E7=AC=A6=E5=90=88-=E4=B8=8D=E5=B1=95=E7=A4=BA?= =?UTF-8?q?=E9=80=BB=E8=BE=91=20=E4=BB=A5=E5=8F=8A=E9=83=A8=E5=88=86?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E4=B8=8B=E6=9C=AA=E7=BB=B4=E6=8A=A4=E6=B8=85?= =?UTF-8?q?=E5=8D=95=E4=B8=8D=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/SarStandProjectLibraryServiceImpl.java | 11 +++++++++-- .../sarStandardsInfo/entity/SarStandardsInfo.java | 4 ++++ .../SarStandProjectLibraryMapper.xml | 4 ++-- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java index 7ac6049d..210feb35 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java @@ -379,7 +379,8 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl wrapper1 = new QueryWrapper<>(); wrapper1.select("ID","STAND_NUMBER","STAND_SORT","STAND_YEAR","STAND_NAME","STAND_EN_NAME","STAND_TYPE","(select count(*) from sar_stand_unqualified" + - " where STAND_ID = r.stand_id and CLOSE_STATE = '1' ) as unCount ", + " where STAND_ID = r.stand_id and CLOSE_STATE = '1' ) as unCount ","(select count(*) from sar_stand_unqualified" + + " where STAND_ID = r.stand_id and CLOSE_STATE = '2' ) as counts ", "(select GROUP_CONCAT( DISTINCT DATE_FORMAT( PLAN_CLOSE_TIME, '%Y-%m-%d' ) ORDER BY PLAN_CLOSE_TIME ) from sar_stand_unqualified where " + " STAND_ID = r.stand_id and CLOSE_STATE = '1' AND PLAN_CLOSE_TIME is NOT NULL ) as endTimes "); wrapper1.last("INNER JOIN sar_stand_project_relation r ON r.stand_id = sar_standards_info.ID WHERE r.project_id ='" + standId + "'"); @@ -408,7 +409,13 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl0L) { + p.setUnCount(s.getUnCount()); + }else if (s.getUnCount() == 0L && s.getCounts()==0L){ + p.setUnCount(2L); + }else { + p.setUnCount(1L); + } p.setEndTimes(s.getEndTimes()); for (SarStandAttrInfo a:list2){ if(s.getId().equals(a.getStandId())){ diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfo.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfo.java index 35ed503f..142e98a1 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfo.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfo.java @@ -146,6 +146,10 @@ public class SarStandardsInfo extends BaseEntity { @TableField(exist = false) private Long unCount; + @ApiModelProperty(value = "为符合数量") + @TableField(exist = false) + private Long counts; + @ApiModelProperty(value = "整改完成时间") @TableField(exist = false) private String endTimes; diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml index 2a39e883..d385bc1a 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml @@ -120,10 +120,10 @@ ON team.project_code = library.project_number WHERE - library.id NOT IN ( SELECT project_id FROM sar_stand_project_relation ) + library.id NOT IN ( SELECT DISTINCT project_id FROM sar_stand_project_relation WHERE project_id is NOT NULL ) - library.id IN ( SELECT project_id FROM sar_stand_project_relation ) + library.id IN ( SELECT DISTINCT project_id FROM sar_stand_project_relation WHERE project_id is NOT NULL ) 1=1 From 995891757dcd5f3963af42fa2e61daa75fa03e6d Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Mon, 6 Dec 2021 09:47:48 +0800 Subject: [PATCH 05/11] =?UTF-8?q?=E8=A1=A5=E5=85=85=E4=B8=8A=E4=B8=80?= =?UTF-8?q?=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SarStandProjectLibraryMapper.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml index d385bc1a..49f537ee 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml @@ -61,10 +61,10 @@ WHERE - library.id NOT IN ( SELECT project_id FROM sar_stand_project_relation ) + library.id NOT IN ( SELECT DISTINCT project_id FROM sar_stand_project_relation WHERE project_id is NOT NULL ) - library.id IN ( SELECT project_id FROM sar_stand_project_relation ) + library.id IN ( SELECT DISTINCT project_id FROM sar_stand_project_relation WHERE project_id is NOT NULL ) 1=1 @@ -185,10 +185,10 @@ ON team.project_code = library.project_number WHERE - library.id NOT IN ( SELECT project_id FROM sar_stand_project_relation ) + library.id NOT IN ( SELECT DISTINCT project_id FROM sar_stand_project_relation WHERE project_id is NOT NULL ) - library.id IN ( SELECT project_id FROM sar_stand_project_relation ) + library.id IN ( SELECT DISTINCT project_id FROM sar_stand_project_relation WHERE project_id is NOT NULL ) 1=1 From 0ce4df725224efcbab27d7c73faab6ecc24b671d Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Mon, 6 Dec 2021 14:51:25 +0800 Subject: [PATCH 06/11] =?UTF-8?q?=E6=9C=AA=E7=AC=A6=E5=90=88=E9=A1=B9?= =?UTF-8?q?=E6=95=B4=E6=94=B9=E5=8A=A0=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SarStandUnqualifiedMapper.xml | 73 +++++++++++++++++-- 1 file changed, 67 insertions(+), 6 deletions(-) diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandUnqualified/SarStandUnqualifiedMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandUnqualified/SarStandUnqualifiedMapper.xml index a0970a42..20c72636 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandUnqualified/SarStandUnqualifiedMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandUnqualified/SarStandUnqualifiedMapper.xml @@ -31,7 +31,7 @@ - SELECT sar_stand_unqualified.*, sar_standards_info.STAND_TYPE as standType from @@ -49,14 +49,45 @@ and RESPONSIBLE_UNIT = #{sar.responsibleUnit} - and STAND_SERIAL_NUMBER like concat(concat('%',#{sar.standSerialNumber}),'%') - or sar_stand_unqualified.STAND_NAME like concat(concat('%',#{sar.standSerialNumber}),'%') + and (REPLACE(STAND_SERIAL_NUMBER,' ','') like concat(concat('%',REPLACE(#{sar.standSerialNumber},' ','')),'%') + or sar_stand_unqualified.STAND_NAME like concat(concat('%',#{sar.standSerialNumber}),'%')) order by sar_stand_unqualified.STAND_ID ,sar_stand_unqualified.ITEMS_NUM asc limit #{start},#{end} - + SELECT + c.* + FROM + ( + SELECT b.*,sar_standards_info.STAND_TYPE as standType FROM ( + SELECT (@i:=@i+1) as rows,sar_stand_unqualified.* FROM + sar_stand_unqualified,(SELECT @i:=0)j + WHERE + close_state = 1 + + and STAND_ID = #{standId} + + + and PRODUCT_NAME like concat(concat('%',#{sar.productName}),'%') + + + and RESPONSIBLE_UNIT = #{sar.responsibleUnit} + + + and (REPLACE(STAND_SERIAL_NUMBER,' ','') like concat(concat('%',REPLACE(#{sar.standSerialNumber},' ','')),'%') + or sar_stand_unqualified.STAND_NAME like concat(concat('%',#{sar.standSerialNumber}),'%')) + + order by sar_stand_unqualified.STAND_ID ,sar_stand_unqualified.ITEMS_NUM asc + limit #{start},#{end} + )b + left join sar_standards_info on b.STAND_ID = sar_standards_info.id + )c + ORDER BY c.STAND_ID, CONVERT(SUBSTRING(c.ITEMS_NUM,1,(SELECT LOCATE('.',CONCAT(c.ITEMS_NUM,'.')))),SIGNED) ,c.rows + + + + + From 95642b0166b340ac8cafcfb6a46b8aa240a4bf65 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Mon, 6 Dec 2021 15:39:10 +0800 Subject: [PATCH 07/11] =?UTF-8?q?=E7=99=BB=E9=99=86=E6=8E=A5=E5=8F=A3=20?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=BF=94=E5=9B=9E=E5=AD=97=E6=AE=B5-----?= =?UTF-8?q?=E9=83=A8=E9=97=A8id=20=E5=92=8C=20=E9=83=A8=E9=97=A8=E5=90=8D?= =?UTF-8?q?=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adc-da-sys/src/main/java/com/adc/da/sys/entity/UserEO.java | 5 ++++- .../src/main/resources/mybatis/mapper/sys/UserEOMapper.xml | 3 +++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/entity/UserEO.java b/adc-da-sys/src/main/java/com/adc/da/sys/entity/UserEO.java index 4923f79b..e77056ef 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sys/entity/UserEO.java +++ b/adc-da-sys/src/main/java/com/adc/da/sys/entity/UserEO.java @@ -2,6 +2,7 @@ package com.adc.da.sys.entity; import com.adc.da.base.entity.BaseEntity; import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; import java.io.Serializable; import java.util.ArrayList; @@ -14,6 +15,7 @@ import java.util.List; * 日期： 2018-09-03
* 版权所有：版权归北京卡达克数据技术中心所有。
*/ +@Data public class UserEO extends BaseEntity implements Serializable { private static final long serialVersionUID = 3658632939727891047L; @@ -51,7 +53,8 @@ public class UserEO extends BaseEntity implements Serializable { private Integer unlockFlag; private String userInfoId; private String orgType; - + private String institutionName; + private String institutionId; private String ssoId; private String token; /** diff --git a/adc-da-sys/src/main/resources/mybatis/mapper/sys/UserEOMapper.xml b/adc-da-sys/src/main/resources/mybatis/mapper/sys/UserEOMapper.xml index 2ffc9c1b..0b4986d5 100644 --- a/adc-da-sys/src/main/resources/mybatis/mapper/sys/UserEOMapper.xml +++ b/adc-da-sys/src/main/resources/mybatis/mapper/sys/UserEOMapper.xml @@ -28,6 +28,8 @@ + + @@ -78,6 +80,7 @@ usid, account, valid_flag, password, uname, ext_info,email,work_num,creation_time,modify_time,oper_user,user_source,disable_flag,unlock_flag,user_type + ,INSTITUTION_NAME,INSTITUTION_ID From 39ffe6944233cc9743b64a0b6075cb7d0266168e Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Mon, 6 Dec 2021 17:05:37 +0800 Subject: [PATCH 08/11] =?UTF-8?q?=E7=99=BB=E5=BD=95=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=AD=97=E6=AE=B5=20=E4=B8=8A=E4=B8=80?= =?UTF-8?q?=E7=BA=A7=E9=83=A8=E9=97=A8=20id=E5=92=8C=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/adc/da/sys/entity/UserEO.java | 5 +++++ .../resources/mybatis/mapper/sys/UserEOMapper.xml | 12 ++++++++---- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/entity/UserEO.java b/adc-da-sys/src/main/java/com/adc/da/sys/entity/UserEO.java index e77056ef..e05e2dd8 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sys/entity/UserEO.java +++ b/adc-da-sys/src/main/java/com/adc/da/sys/entity/UserEO.java @@ -34,6 +34,11 @@ public class UserEO extends BaseEntity implements Serializable { private String password; private String account; private String usid; + private String sex; + private String phone; + private String upDeptName; + private String upDeptId; + // 扩展字段 private String userType; private String orgId; diff --git a/adc-da-sys/src/main/resources/mybatis/mapper/sys/UserEOMapper.xml b/adc-da-sys/src/main/resources/mybatis/mapper/sys/UserEOMapper.xml index 0b4986d5..c0bb3b8a 100644 --- a/adc-da-sys/src/main/resources/mybatis/mapper/sys/UserEOMapper.xml +++ b/adc-da-sys/src/main/resources/mybatis/mapper/sys/UserEOMapper.xml @@ -30,6 +30,8 @@ + + @@ -80,7 +82,7 @@ usid, account, valid_flag, password, uname, ext_info,email,work_num,creation_time,modify_time,oper_user,user_source,disable_flag,unlock_flag,user_type - ,INSTITUTION_NAME,INSTITUTION_ID + ,INSTITUTION_NAME,INSTITUTION_ID,SEX,PHONE @@ -751,9 +753,11 @@ From a018459ad17aa285f0c576fad7c22fa48cee6ad1 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Tue, 7 Dec 2021 17:46:12 +0800 Subject: [PATCH 10/11] =?UTF-8?q?=E8=AF=84=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../QualityEvaluationController.java | 9 ++-- .../dao/QualityEvaluationDao.java | 3 ++ .../entity/QualityEvaluation.java | 9 +++- .../impl/QualityEvaluationServiceImpl.java | 52 ++++++++++--------- .../QualityEvaluationMapper.xml | 38 ++++++++++++-- 5 files changed, 76 insertions(+), 35 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/controller/QualityEvaluationController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/controller/QualityEvaluationController.java index 22621812..c146dbf8 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/controller/QualityEvaluationController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/controller/QualityEvaluationController.java @@ -71,16 +71,17 @@ public class QualityEvaluationController extends BaseController> getEvaluationForm(FormVO form){ QualityEvaluation qualityEvaluation = new QualityEvaluation(); qualityEvaluation.setLawId(form.getLawId()) ; qualityEvaluation.setUserId(form.getUserId()) ; + qualityEvaluation.setEvaluationType(form.getEvaluationType()); - iQualityEvaluationService.getEvaluationForm(qualityEvaluation); + List evaluationForm = iQualityEvaluationService.getEvaluationForm(qualityEvaluation); - return null; + return Result.success(evaluationForm); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/dao/QualityEvaluationDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/dao/QualityEvaluationDao.java index 9432145d..0059d8ca 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/dao/QualityEvaluationDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/dao/QualityEvaluationDao.java @@ -23,4 +23,7 @@ public interface QualityEvaluationDao extends BaseMapper { public IPage getHistory(IPage page,@Param(Constants.WRAPPER) QueryWrapper queryWrapper); + + public List getEvaluationForm(@Param(Constants.WRAPPER) QueryWrapper queryWrapper); + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/entity/QualityEvaluation.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/entity/QualityEvaluation.java index ddcb4919..48272e92 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/entity/QualityEvaluation.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/entity/QualityEvaluation.java @@ -77,13 +77,18 @@ public class QualityEvaluation extends BaseEntity { @ApiModelProperty(value = "创建时间") @TableField(fill = FieldFill.INSERT) - private LocalDateTime createTime; + private Date createTime; @ApiModelProperty(value = "更新时间") @TableField(fill = FieldFill.INSERT_UPDATE) - private LocalDateTime modifyTime; + private Date modifyTime; + + @TableField(exist = false) + @ApiModelProperty(value = "指标名称") + private String indexTitle; + @TableField(exist = false) private Integer page; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/service/impl/QualityEvaluationServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/service/impl/QualityEvaluationServiceImpl.java index b068eff1..786abe9a 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/service/impl/QualityEvaluationServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/service/impl/QualityEvaluationServiceImpl.java @@ -58,6 +58,7 @@ public class QualityEvaluationServiceImpl extends ServiceImpl tableData = form.getTableData(); tableData.forEach(item->{ + item.setModifyTime(new Date()); item.setId( UUIDUtils.randomUUID20()); if ("number".equals(item.getValueType()) ){ item.setScore(String.valueOf (Double.valueOf(item.getScore()) * 2) ); @@ -83,6 +84,7 @@ public class QualityEvaluationServiceImpl extends ServiceImpl getEvaluationForm(QualityEvaluation query) { QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.select("UNAME as userName","score","reason","create_time as createTime","modify_time as modifyTime","idx.value_type as valueType") - .last("JOIN ts_user user ON quality_evaluation.user_id = user.USID" + - "LEFT JOIN evaluation_index as idx on iex.id=quality_evaluation.evaluation_index"); if (query.getLawId()!=null){ @@ -113,8 +112,7 @@ public class QualityEvaluationServiceImpl extends ServiceImpl getScore(String lawId) { - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("law_id",lawId); - List list = this.list(queryWrapper); + queryWrapper.eq("law_id",lawId) + .eq("`index`.value_type","number"); + +// List list = this.list(queryWrapper); + + Page page = new Page<>(1, 1000); + + List list = qualityEvaluationDao.getHistory(page, queryWrapper).getRecords(); return list.stream() .collect(Collectors.groupingBy(QualityEvaluation::getEvaluationType, - Collectors.averagingDouble(item -> getScoreSingle(item)))); + Collectors.averagingDouble(item ->Double.valueOf(item.getScore()) ))); } - private Double getScoreSingle(QualityEvaluation item){ - - QueryWrapper indexQuery = new QueryWrapper<>(); - indexQuery.select("code","weight"); - - List indexList = iEvaluationIndexService.list(indexQuery); - - Map weightMap = indexList.stream() - .collect(Collectors.toMap(EvaluationIndex::getCode, obj -> Float.valueOf(obj.getWeight()))); - - - - String score = item.getScore(); - return ((score == null || (Float.valueOf(item.getScore()) < 0.0)) ? 0.0 : Float.valueOf(score) * weightMap.get(item.getEvaluationIndex())); - } +// private Double getScoreSingle(QualityEvaluation item){ +// +// QueryWrapper indexQuery = new QueryWrapper<>(); +// indexQuery.select("code","weight") +// .eq("value_type","number"); +// +// List indexList = iEvaluationIndexService.list(indexQuery); +// +// Map weightMap = indexList.stream() +// .collect(Collectors.toMap(EvaluationIndex::getCode, obj -> Float.valueOf(obj.getWeight()))); +// +// +// +// String score = item.getScore(); +// return (score == null && !weightMap.containsKey(item.getEvaluationIndex()) ) ? 0.0 : Float.valueOf(score) * weightMap.get(item.getEvaluationIndex()); +// } diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarEnterpriseStandardEvalution/QualityEvaluationMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarEnterpriseStandardEvalution/QualityEvaluationMapper.xml index 1da1caba..4d603e7f 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarEnterpriseStandardEvalution/QualityEvaluationMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarEnterpriseStandardEvalution/QualityEvaluationMapper.xml @@ -8,18 +8,46 @@ SELECT `user`.UNAME AS userName, eva.user_id, - iex.index_type as valueType, - avg(eva.score * iex.weight) AS score, + `index`.value_type as valueType, + eva.evaluation_type as evaluationType, + avg(eva.score * `index`.weight) AS score, min(eva.create_time) as createTiem, max(eva.modify_time) as modifyTime FROM quality_evaluation AS eva LEFT JOIN ts_user `user` ON eva.user_id = `user`.USID - LEFT JOIN evaluation_index AS iex ON eva.evaluation_index = iex.id + LEFT JOIN evaluation_index AS `index` ON eva.evaluation_index = `index`.id + ${ew.customSqlSegment} GROUP BY userName, eva.user_id, - index_type - ${ew.customSqlSegment} + index_type, + valueType, + evaluationType + ORDER BY modifyTime DESC + + + + + From ab07fbf9ceca0c36756927ad04cee86a900121d0 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Thu, 9 Dec 2021 10:07:20 +0800 Subject: [PATCH 11/11] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=A0=87=E5=87=86?= =?UTF-8?q?=E4=B8=8E=E4=BF=AE=E6=94=B9=E6=A0=87=E5=87=86=20=E6=8F=92?= =?UTF-8?q?=E5=85=A5=E6=95=B0=E6=8D=AE=E5=BA=93=E5=8F=96=E6=B6=88=E6=97=B6?= =?UTF-8?q?=E5=88=86=E7=A7=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/adc/da/utils/util/FieldConvertUtil.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/utils/util/FieldConvertUtil.java b/adc-da-slrs/src/main/java/com/adc/da/utils/util/FieldConvertUtil.java index 5323d86d..b21525e1 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/utils/util/FieldConvertUtil.java +++ b/adc-da-slrs/src/main/java/com/adc/da/utils/util/FieldConvertUtil.java @@ -108,7 +108,7 @@ public class FieldConvertUtil { List timeList = Arrays.asList(timeStr.split(",")); List collect = timeList.stream() - .map(item -> "str_to_date('" + item + "','%Y-%m-%d %H:%i:%s')") + .map(item -> "str_to_date('" + item + "','%Y-%m-%d')") .collect(Collectors.toList()); timeStr ="concat(" + String.join(", \',\' ,", collect) + ")"; } else { @@ -143,7 +143,7 @@ public class FieldConvertUtil { String mustValue = "'"+ UUIDUtils.randomUUID20() + "','" + id + "','0','" + LoginUserUtil.getUserId() + "'"; Date date = new Date(); - SimpleDateFormat sf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + SimpleDateFormat sf = new SimpleDateFormat("yyyy-MM-dd"); String nowTime = sf.format(date); String timeValue = "," + changeTimeValue(nowTime); mustValue += timeValue + timeValue;