From 1a88f21eb09d13b73152e283afb67974ca13756a Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Sun, 12 Dec 2021 10:52:29 +0800 Subject: [PATCH 01/12] =?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=9B=9E=E6=98=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/sarStandUnqualified/SarStandUnqualifiedMapper.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 20c72636..8261e623 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 @@ -61,7 +61,7 @@ c.* FROM ( - SELECT b.*,sar_standards_info.STAND_TYPE as standType FROM ( + SELECT b.*,sar_standards_info.STAND_TYPE as standType , ts_user.UNAME as dutyEngineerName , ts_user.INSTITUTION_NAME as responsibleUnit FROM ( SELECT (@i:=@i+1) as rows,sar_stand_unqualified.* FROM sar_stand_unqualified,(SELECT @i:=0)j WHERE @@ -83,6 +83,7 @@ limit #{start},#{end} )b left join sar_standards_info on b.STAND_ID = sar_standards_info.id + left join ts_user on ts_user.USID = b.DUTY_ENGINEER )c ORDER BY c.STAND_ID, CONVERT(SUBSTRING(c.ITEMS_NUM,1,(SELECT LOCATE('.',CONCAT(c.ITEMS_NUM,'.')))),SIGNED) ,c.rows From c87d843055d130fecb3fd2645f6ca57b7c57fd1c Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Mon, 13 Dec 2021 14:15:44 +0800 Subject: [PATCH 02/12] =?UTF-8?q?=E5=BE=81=E6=B1=82=E6=84=8F=E8=A7=81?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=E6=96=B0---=EF=BC=81=EF=BC=81=EF=BC=81?= =?UTF-8?q?=EF=BC=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/adc/da/common/ActDefineStartMap.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adc-da-activiti/src/main/java/com/adc/da/common/ActDefineStartMap.java b/adc-da-activiti/src/main/java/com/adc/da/common/ActDefineStartMap.java index 2fa07426..67304700 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/common/ActDefineStartMap.java +++ b/adc-da-activiti/src/main/java/com/adc/da/common/ActDefineStartMap.java @@ -16,7 +16,7 @@ public class ActDefineStartMap { Map map = new TreeMap<>(); map.put("1","standardLibraryWkflow"); map.put("2","standardSurveyWorkFlow"); - map.put("3","standardCommentProcessWorkFlow"); + map.put("3","StandAskForOpinion"); map.put("4","standardregulatoryinventory"); map.put("5","projectEvaluationProcess"); map.put("6","Projectcomplianceassessment"); From 301ba42d65b3c31b6b35b1c7ec7339cbe44c65f4 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Mon, 13 Dec 2021 16:17:25 +0800 Subject: [PATCH 03/12] =?UTF-8?q?=E6=89=8B=E6=9C=BA=E7=AB=AF=E6=9F=A5?= =?UTF-8?q?=E4=BA=BA=E6=8E=A5=E5=8F=A3=20=E4=BB=A5=E5=8F=8A=20=E9=83=A8?= =?UTF-8?q?=E5=88=86=E6=B6=89=E5=8F=8A=E5=88=B0=E5=BC=80=E8=80=80=E7=9A=84?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=20=E5=8A=A0=E4=BA=86=E5=A4=87=E6=B3=A8=20?= =?UTF-8?q?=E6=88=91=E5=85=88=E6=94=B9=E4=BA=86=E4=B8=80=E4=B8=8B=20?= =?UTF-8?q?=E7=AD=89=E5=BC=80=E8=80=80=E5=9B=9E=E6=9D=A5=E7=9C=8B=E4=B8=80?= =?UTF-8?q?=E4=B8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SarStandFileEOServiceImpl.java | 8 ++++---- .../com/adc/da/sys/controller/UserEOController.java | 11 +++++++++++ .../src/main/java/com/adc/da/sys/dao/UserEODao.java | 3 +++ .../java/com/adc/da/sys/entity/UserPhoneDTO.java | 13 +++++++++++++ .../java/com/adc/da/sys/service/IUserEOService.java | 4 ++++ .../adc/da/sys/service/impl/UserEOServiceImpl.java | 10 ++++++---- .../resources/mybatis/mapper/sys/UserEOMapper.xml | 10 ++++++++++ 7 files changed, 51 insertions(+), 8 deletions(-) create mode 100644 adc-da-sys/src/main/java/com/adc/da/sys/entity/UserPhoneDTO.java diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarStandFileEOServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarStandFileEOServiceImpl.java index 3713a30a..848d2eed 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarStandFileEOServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarStandFileEOServiceImpl.java @@ -77,13 +77,13 @@ public class SarStandFileEOServiceImpl implements SarStandFileEOService { queryWrapper.eq("STAND_ID",standId).eq("USE_MODEL","WEB_FILE"); List sarStandFileEOS = sarStandFileEODao.selectList(queryWrapper); - + //开耀这地方我把selectOne改成了批量因为 查单个数据里面出了问题你看看给改一下 sarStandFileEOS.forEach(item->{ QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("ORI_ATT_ID",item.getOriAttId()) - .eq("USE_MODEL","SOURCE_FILE"); - SarStandFileEO sarStandFileEO = sarStandFileEODao.selectOne(wrapper); - item.setFileOldName(sarStandFileEO.getFileName()); + .eq("USE_MODEL","SOURCE_FILE").orderByDesc("CREATION_TIME"); + List sarStandFileEO = sarStandFileEODao.selectList(wrapper); + item.setFileOldName(sarStandFileEO.get(0).getFileOldName()); }); return sarStandFileEOS; diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/controller/UserEOController.java b/adc-da-sys/src/main/java/com/adc/da/sys/controller/UserEOController.java index 9e48c42c..909c6720 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sys/controller/UserEOController.java +++ b/adc-da-sys/src/main/java/com/adc/da/sys/controller/UserEOController.java @@ -9,6 +9,7 @@ import com.adc.da.http.Result; import com.adc.da.sys.constant.ValidFlagEnum; import com.adc.da.sys.entity.RoleEO; import com.adc.da.sys.entity.UserEO; +import com.adc.da.sys.entity.UserPhoneDTO; import com.adc.da.sys.page.UserEOPage; import com.adc.da.sys.service.IOrgEOService; import com.adc.da.sys.service.IRoleEOService; @@ -66,6 +67,16 @@ public class UserEOController extends BaseController { return Result.success(userVO); } + + + @ApiOperation(value = "|UserEO|详情") + @GetMapping("/getUserByPhone") +// @RequiresPermissions("sys:user:get") + public ResponseMessage> getUserByName(@RequestParam(required = false,value = "name")String name){ + List userPhoneDTOS=userEOService.getUserByName(name); + return Result.success(userPhoneDTOS); + } + @ApiOperation(value = "|UserEO|详情接口") @GetMapping("/getById") public ResponseMessage getByIdFeignClient(String id) throws Exception { diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/dao/UserEODao.java b/adc-da-sys/src/main/java/com/adc/da/sys/dao/UserEODao.java index 7350abc3..feb6b27f 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sys/dao/UserEODao.java +++ b/adc-da-sys/src/main/java/com/adc/da/sys/dao/UserEODao.java @@ -2,6 +2,7 @@ package com.adc.da.sys.dao; import com.adc.da.base.page.BasePage; import com.adc.da.sys.entity.UserEO; +import com.adc.da.sys.entity.UserPhoneDTO; import com.adc.da.sys.page.RoleUserEOPage; import com.adc.da.sys.page.UserEOPage; import com.adc.da.sys.vo.RoleUserVO; @@ -171,5 +172,7 @@ public interface UserEODao extends BaseMapper { public UserEO getUserEOByAccountNotDeleted(String account); + //手机端接口 只查人 + List getUserByName(@Param("name") String name); } diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/entity/UserPhoneDTO.java b/adc-da-sys/src/main/java/com/adc/da/sys/entity/UserPhoneDTO.java new file mode 100644 index 00000000..b7e6e3b4 --- /dev/null +++ b/adc-da-sys/src/main/java/com/adc/da/sys/entity/UserPhoneDTO.java @@ -0,0 +1,13 @@ +package com.adc.da.sys.entity; + +import lombok.Data; + +@Data +public class UserPhoneDTO { + + private String usId; + + private String userName; + + +} diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/service/IUserEOService.java b/adc-da-sys/src/main/java/com/adc/da/sys/service/IUserEOService.java index 3e3e70ec..2ac157e6 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sys/service/IUserEOService.java +++ b/adc-da-sys/src/main/java/com/adc/da/sys/service/IUserEOService.java @@ -3,6 +3,7 @@ package com.adc.da.sys.service; import com.adc.da.base.page.BasePage; import com.adc.da.http.ResponseMessage; import com.adc.da.sys.entity.UserEO; +import com.adc.da.sys.entity.UserPhoneDTO; import com.adc.da.sys.page.RoleUserEOPage; import com.adc.da.sys.page.UserEOPage; import com.adc.da.sys.vo.RoleUserVO; @@ -75,5 +76,8 @@ public interface IUserEOService extends IService { public UserEO getUserByLoginNameNotDeleted(String userName); + //手机端接口 只查人 + List getUserByName(String name); + } diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/service/impl/UserEOServiceImpl.java b/adc-da-sys/src/main/java/com/adc/da/sys/service/impl/UserEOServiceImpl.java index b98902f4..2f8b0bec 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sys/service/impl/UserEOServiceImpl.java +++ b/adc-da-sys/src/main/java/com/adc/da/sys/service/impl/UserEOServiceImpl.java @@ -8,10 +8,7 @@ import com.adc.da.sys.constant.ValidFlagEnum; import com.adc.da.sys.dao.OrgEODao; import com.adc.da.sys.dao.UserEODao; import com.adc.da.sys.dao.UserInfoEODao; -import com.adc.da.sys.entity.OrgEO; -import com.adc.da.sys.entity.UserEO; -import com.adc.da.sys.entity.UserInfoEO; -import com.adc.da.sys.entity.UserOrgEO; +import com.adc.da.sys.entity.*; import com.adc.da.sys.page.RoleUserEOPage; import com.adc.da.sys.page.UserEOPage; import com.adc.da.sys.service.IOrgEOService; @@ -514,4 +511,9 @@ public class UserEOServiceImpl extends ServiceImpl implements return userEO; } + @Override + public List getUserByName(String name) { + return this.baseMapper.getUserByName(name); + } + } 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 c0bb3b8a..d3ccac97 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 @@ -793,4 +793,14 @@ + + From 6db9220082dddc47df51e95c5c9b7522b5761306 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Mon, 13 Dec 2021 17:49:33 +0800 Subject: [PATCH 04/12] =?UTF-8?q?=E6=89=8B=E6=9C=BA=E7=AB=AF=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E4=BA=BA=E5=91=98=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/adc/da/sys/controller/UserEOController.java | 4 ++-- adc-da-sys/src/main/java/com/adc/da/sys/dao/UserEODao.java | 2 +- .../src/main/java/com/adc/da/sys/entity/UserPhoneDTO.java | 2 ++ .../main/java/com/adc/da/sys/service/IUserEOService.java | 2 +- .../java/com/adc/da/sys/service/impl/UserEOServiceImpl.java | 4 ++-- .../src/main/resources/mybatis/mapper/sys/UserEOMapper.xml | 6 ++++-- 6 files changed, 12 insertions(+), 8 deletions(-) diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/controller/UserEOController.java b/adc-da-sys/src/main/java/com/adc/da/sys/controller/UserEOController.java index 909c6720..377c6226 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sys/controller/UserEOController.java +++ b/adc-da-sys/src/main/java/com/adc/da/sys/controller/UserEOController.java @@ -72,8 +72,8 @@ public class UserEOController extends BaseController { @ApiOperation(value = "|UserEO|详情") @GetMapping("/getUserByPhone") // @RequiresPermissions("sys:user:get") - public ResponseMessage> getUserByName(@RequestParam(required = false,value = "name")String name){ - List userPhoneDTOS=userEOService.getUserByName(name); + public ResponseMessage> getUserByName(@RequestParam(required = false,value = "name")String name,@RequestParam("page")Integer page){ + List userPhoneDTOS=userEOService.getUserByName(name,page); return Result.success(userPhoneDTOS); } diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/dao/UserEODao.java b/adc-da-sys/src/main/java/com/adc/da/sys/dao/UserEODao.java index feb6b27f..8e80deae 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sys/dao/UserEODao.java +++ b/adc-da-sys/src/main/java/com/adc/da/sys/dao/UserEODao.java @@ -173,6 +173,6 @@ public interface UserEODao extends BaseMapper { public UserEO getUserEOByAccountNotDeleted(String account); //手机端接口 只查人 - List getUserByName(@Param("name") String name); + List getUserByName(@Param("name") String name,@Param("page")Integer page); } diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/entity/UserPhoneDTO.java b/adc-da-sys/src/main/java/com/adc/da/sys/entity/UserPhoneDTO.java index b7e6e3b4..8c416903 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sys/entity/UserPhoneDTO.java +++ b/adc-da-sys/src/main/java/com/adc/da/sys/entity/UserPhoneDTO.java @@ -9,5 +9,7 @@ public class UserPhoneDTO { private String userName; + private Integer total; + } diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/service/IUserEOService.java b/adc-da-sys/src/main/java/com/adc/da/sys/service/IUserEOService.java index 2ac157e6..73a74e01 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sys/service/IUserEOService.java +++ b/adc-da-sys/src/main/java/com/adc/da/sys/service/IUserEOService.java @@ -77,7 +77,7 @@ public interface IUserEOService extends IService { public UserEO getUserByLoginNameNotDeleted(String userName); //手机端接口 只查人 - List getUserByName(String name); + List getUserByName(String name,Integer page); } diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/service/impl/UserEOServiceImpl.java b/adc-da-sys/src/main/java/com/adc/da/sys/service/impl/UserEOServiceImpl.java index 2f8b0bec..d3265e76 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sys/service/impl/UserEOServiceImpl.java +++ b/adc-da-sys/src/main/java/com/adc/da/sys/service/impl/UserEOServiceImpl.java @@ -512,8 +512,8 @@ public class UserEOServiceImpl extends ServiceImpl implements } @Override - public List getUserByName(String name) { - return this.baseMapper.getUserByName(name); + public List getUserByName(String name,Integer page) { + return this.baseMapper.getUserByName(name,page); } } 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 d3ccac97..240dcca8 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 @@ -794,13 +794,15 @@ From 0babd2b56f995b5a30efca06ad0b6f3d7a91c34e Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Tue, 14 Dec 2021 16:07:51 +0800 Subject: [PATCH 05/12] =?UTF-8?q?=E7=BB=9F=E4=B8=80=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E4=BA=86=E4=B8=80=E4=B8=8B=E5=88=86=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mybatis/mapper/sarStandIdea/SarPublicIdeaAllMapper.xml | 2 +- .../sarStandProjectLibrary/SarStandProjectLibraryMapper.xml | 4 ++-- .../SarInterpretationNationalStandardMapper.xml | 2 +- .../SarStandardComplianceProductAssessMapper.xml | 2 +- .../src/main/resources/mybatis/mapper/sys/UserEOMapper.xml | 5 +++-- 5 files changed, 8 insertions(+), 7 deletions(-) diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandIdea/SarPublicIdeaAllMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandIdea/SarPublicIdeaAllMapper.xml index 864e0387..c2488f4b 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandIdea/SarPublicIdeaAllMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandIdea/SarPublicIdeaAllMapper.xml @@ -16,7 +16,7 @@ left join ts_user on sar_public_idea_all.user_id=ts_user.USID WHERE sar_public_idea_all.idea_id = #{ideaId} - LIMIT ${(page-1)*size},${page*size} + LIMIT ${(page-1)*size},${size} diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardComplianceAssessResult/SarInterpretationNationalStandardMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardComplianceAssessResult/SarInterpretationNationalStandardMapper.xml index 69179058..2f9f57ad 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardComplianceAssessResult/SarInterpretationNationalStandardMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardComplianceAssessResult/SarInterpretationNationalStandardMapper.xml @@ -59,7 +59,7 @@ AND specific_item like concat(concat('%',#{specificItem}),'%') ORDER BY STAND_ID, specific_item - LIMIT ${(current-1)*size},${current*size} + LIMIT ${(current-1)*size},${size} ) c ORDER BY c.STAND_ID, CONVERT(SUBSTRING(c.specific_item,1,(SELECT LOCATE('.',CONCAT(c.specific_item,'.')))),SIGNED) ,rows From a8fda1bb9436365d467b59f9497d8339ba6f2911 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Tue, 14 Dec 2021 16:33:07 +0800 Subject: [PATCH 06/12] =?UTF-8?q?=E6=A0=87=E5=87=86=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3!!!?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml index 59dcc305..6d089807 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml @@ -759,7 +759,7 @@ SAR_STANDARDS_INFO.STAND_YEAR),' ','')) like trim(replace(concat(concat('%',#{page.standNumber}),'%'),' ','')) and SAR_STANDARDS_INFO.STAND_YEAR != '') or (trim(replace(concat(SAR_STANDARDS_INFO.STAND_SORT,' ',SAR_STANDARDS_INFO.STAND_NUMBER),' ','')) like trim(replace(concat(concat('%',#{page.standNumber}),'%'),' ','')) - or (stand_name like concat(concat('%',#{page.standNumber}),'%')) + or (trim(replace(stand_name,' ','')) like trim(replace(concat(concat('%',#{page.standNumber}),'%'),' ','')) ) ) From cae1605ab156c94b34ccbe2c388c8d72ddd8f6bd Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Tue, 14 Dec 2021 17:45:23 +0800 Subject: [PATCH 07/12] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E7=BB=84=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E5=AE=8C=E5=B7=B2=E7=BB=8F=E5=8F=AF=E4=BB=A5=E5=9B=9E?= =?UTF-8?q?=E6=98=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/WgWorkGroupServiceImpl.java | 30 ++++++++++++++++--- 1 file changed, 26 insertions(+), 4 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgWorkGroup/service/impl/WgWorkGroupServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgWorkGroup/service/impl/WgWorkGroupServiceImpl.java index 04e3946f..0c88d87d 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgWorkGroup/service/impl/WgWorkGroupServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgWorkGroup/service/impl/WgWorkGroupServiceImpl.java @@ -23,6 +23,7 @@ import com.adc.da.slrs.wgWorkGroup.dao.WgWorkGroupDao; import com.adc.da.slrs.wgWorkGroup.entity.WgWorkGroupDTO; import com.adc.da.slrs.wgWorkGroup.entity.WgWorkGroupShowDTO; import com.adc.da.slrs.wgWorkGroup.service.IWgWorkGroupService; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -333,15 +334,21 @@ public class WgWorkGroupServiceImpl extends ServiceImpl { WgDept wgDept=new WgDept(); BeanUtils.copyProperties(wgDeptShow,wgDept); + if (null==wgDept.getWgId()){ + wgDept.setWgId(wgWorkGroupShowDTO.getId()); + } wgDepts.add(wgDept); }); - flag = wgDeptService.saveOrUpdateBatch(wgDepts); } if (null != wgWorkGroupShowDTO.getWgMeetingInfos() && wgWorkGroupShowDTO.getWgMeetingInfos().size() > 0) { List removeMeet = new ArrayList<>(); List wgMeetingUserRelations = new ArrayList<>(); wgWorkGroupShowDTO.getWgMeetingInfos().forEach(wgMeetingInfo -> { + if (null==wgMeetingInfo.getId()){ + wgMeetingInfo.setId(String.valueOf(UUID.randomUUID())); + wgMeetingInfo.setWgId(wgWorkGroupShowDTO.getId()); + } wgMeetingInfo.getMeetingPeople().forEach(s -> { WgMeetingUserRelation wgMeetingUserRelation = new WgMeetingUserRelation(); wgMeetingUserRelation.setUserId(s); @@ -350,27 +357,42 @@ public class WgWorkGroupServiceImpl extends ServiceImpl 0) { List wgNetInfos = new ArrayList<>(); wgWorkGroupShowDTO.getWgNetInfos().forEach(wgNetInfoDTO -> { WgNetInfo wgNetInfo = new WgNetInfo(); BeanUtils.copyProperties(wgNetInfoDTO, wgNetInfo); + if (null==wgNetInfo.getWgId()){ + wgNetInfo.setWgId(wgWorkGroupShowDTO.getId()); + } wgNetInfos.add(wgNetInfo); }); flag = wgNetInfoService.saveOrUpdateBatch(wgNetInfos); } if (null != wgWorkGroupShowDTO.getWgPayInfos() && wgWorkGroupShowDTO.getWgPayInfos().size() > 0) { + if (!wgWorkGroupShowDTO.getWgPayInfos().isEmpty()){ + wgWorkGroupShowDTO.getWgPayInfos().forEach(wgPayInfo -> { + if (null==wgPayInfo.getWgId()){ + wgPayInfo.setWgId(wgWorkGroupShowDTO.getId()); + } + }); + } flag = wgPayInfoService.saveOrUpdateBatch(wgWorkGroupShowDTO.getWgPayInfos()); } if (null != wgWorkGroupShowDTO.getWgStandorpolicyInfos() && wgWorkGroupShowDTO.getWgStandorpolicyInfos().size() > 0) { + if (!wgWorkGroupShowDTO.getWgStandorpolicyInfos().isEmpty()){ + wgWorkGroupShowDTO.getWgStandorpolicyInfos().forEach(wgStandorpolicyInfo -> { + if (null==wgStandorpolicyInfo.getWgId()){ + wgStandorpolicyInfo.setWgId(wgWorkGroupShowDTO.getId()); + } + }); + } flag = wgStandorpolicyInfoService.saveOrUpdateBatch(wgWorkGroupShowDTO.getWgStandorpolicyInfos()); } From 7521af3dd0ef05e213489cb6e1f244153b4f4120 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Tue, 14 Dec 2021 21:18:43 +0800 Subject: [PATCH 08/12] feat: There is no way the, buss process --- .../da/FeignClient/workFlowFeignClient.java | 4 + .../workFlowFeignClientImpl.java | 6 ++ .../controller/WorkFlowController.java | 11 ++- .../workFlow/entity/BusProcessModelHis.java | 88 +++++++++++++++++++ 4 files changed, 105 insertions(+), 4 deletions(-) create mode 100644 adc-da-activiti/src/main/java/com/adc/da/workFlow/entity/BusProcessModelHis.java 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 5a1572d4..ff0bb4f8 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 @@ -4,6 +4,7 @@ import com.adc.da.common.*; import com.adc.da.common.Category; import com.adc.da.common.Page; import com.adc.da.workFlow.entity.BusProcessEvaluationHis; +import com.adc.da.workFlow.entity.BusProcessModelHis; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -18,6 +19,9 @@ import java.util.Set; //@FeignClient(value = "shan6") public interface workFlowFeignClient { + @RequestMapping(value = "/bat-wkflow/busProcessModel/processModelHisOne",method = RequestMethod.GET) + BusProcessModelHis processModelHisOne(@RequestParam("pid") String pid, @RequestParam("taskId") String taskId); + @RequestMapping(value = "/bat-wkflow/busProcessEvaluation/evaluationHisList",method = RequestMethod.GET) List evaluationHisList(@RequestParam("pid") String pid); 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 da6071a8..d158c2f0 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 @@ -9,6 +9,7 @@ import com.adc.da.common.Page; import com.adc.da.sys.entity.UserEO; import com.adc.da.sys.service.IUserEOService; import com.adc.da.workFlow.entity.BusProcessEvaluationHis; +import com.adc.da.workFlow.entity.BusProcessModelHis; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import org.springframework.web.bind.annotation.RequestBody; @@ -26,6 +27,11 @@ public class workFlowFeignClientImpl { @Autowired private IUserEOService userEOService; + public BusProcessModelHis processModelHisOne(@RequestParam("pid") String pid,@RequestParam("taskId") String taskId){ + BusProcessModelHis stringWrapper = workFlowFeignClient.processModelHisOne(pid,taskId); + return stringWrapper; + } + public List evaluationHisList(@RequestParam("pid") String pid){ List stringWrapper = workFlowFeignClient.evaluationHisList(pid); return stringWrapper; 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 1865962f..1e3215d2 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 @@ -17,10 +17,7 @@ import com.adc.da.sys.entity.UserEO; import com.adc.da.sys.service.IUserEOService; import com.adc.da.util.LoginUserUtil; import com.adc.da.workFlow.dao.ExportExcelMapper; -import com.adc.da.workFlow.entity.BusProcessEvaluationHis; -import com.adc.da.workFlow.entity.ExportExcel; -import com.adc.da.workFlow.entity.ExportExcelEO; -import com.adc.da.workFlow.entity.ProcessDetailExport; +import com.adc.da.workFlow.entity.*; import com.adc.da.workFlow.service.WorkFlowService; import com.alibaba.fastjson.JSON; import io.swagger.annotations.Api; @@ -50,6 +47,12 @@ public class WorkFlowController { // @Autowired // private ExportExcelMapper exportExcelMapper; + @ApiOperation(value = "查询在线编辑流程当前节点编辑对象") + @GetMapping("/processModelHisOne") + public BusProcessModelHis processModelHisOne(@RequestParam("pid") String pid,@RequestParam("taskId") String taskId){ + return workFlowFeignClient.processModelHisOne(pid); + } + @ApiOperation(value = "查询流程父节点所有评分") @GetMapping("/evaluationHisList") public List evaluationHisList(@RequestParam("pid") String pid){ diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/entity/BusProcessModelHis.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/entity/BusProcessModelHis.java new file mode 100644 index 00000000..82b0692a --- /dev/null +++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/entity/BusProcessModelHis.java @@ -0,0 +1,88 @@ +package com.adc.da.workFlow.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import java.io.Serializable; + +/** + *

+ * 流程模块历史表 + *

+ * + * @author super_liu + * @since 2021-09-17 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@Accessors(chain = true) +@ApiModel(value="BusProcessModelHis对象", description="流程模块历史表") +public class BusProcessModelHis implements Serializable { + + private static final long serialVersionUID=1L; + + @ApiModelProperty(value = "主键") + @TableId(value = "ID", type = IdType.UUID) + private String id; + + @ApiModelProperty(value = "标准id") + @TableField("STAND_ID") + private String standId; + + @ApiModelProperty(value = "处理人") + @TableField("USER_ID") + private String userId; + + @ApiModelProperty(value = "信息") + @TableField("MESG") + private String mesg; + + @ApiModelProperty(value = "节点信息") + @TableField("TASK_INFO") + private String taskInfo; + + @ApiModelProperty(value = "任务id") + @TableField("TASK_ID") + private String taskId; + + @ApiModelProperty(value = "流程实例id") + @TableField("P_ID") + private String pId; + + @ApiModelProperty(value = "流程名称") + @TableField("PRC_NAME") + private String prcName; + + @ApiModelProperty(value = "创建时间") + @TableField("CREATE_TIME") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + private String createTime; + + @ApiModelProperty(value = "更新时间") + @TableField("UPDATE_TIME") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + private String updateTime; + + @ApiModelProperty(value = "onlyOffice 是否编辑 0 未编辑 1 已编辑") + @TableField("EDIT_STATUS") + private String editStatus; + + @ApiModelProperty(value = "onlyOffice 编辑文件存储路径") + @TableField("EDIT_FILE_PATH") + private String editFilePath; + + @ApiModelProperty(value = "逻辑状态") + @TableField("FLAG") + private String flag; + + @ApiModelProperty(value = "onlyOffice 访问编辑文件全路径") + @TableField(exist = false) + private String downLoadUrl; +} From 1e83fad8bd177d68899c092157c6333e437bec86 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Tue, 14 Dec 2021 21:56:42 +0800 Subject: [PATCH 09/12] feat: There is no way the --- .../java/com/adc/da/workFlow/controller/WorkFlowController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 1e3215d2..5949b1ce 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 @@ -50,7 +50,7 @@ public class WorkFlowController { @ApiOperation(value = "查询在线编辑流程当前节点编辑对象") @GetMapping("/processModelHisOne") public BusProcessModelHis processModelHisOne(@RequestParam("pid") String pid,@RequestParam("taskId") String taskId){ - return workFlowFeignClient.processModelHisOne(pid); + return workFlowFeignClient.processModelHisOne(pid,taskId); } @ApiOperation(value = "查询流程父节点所有评分") From 121dc4b9657c3c59fb3e132c1acbe6b53de9bb27 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Wed, 15 Dec 2021 09:08:41 +0800 Subject: [PATCH 10/12] feat: There is no way the, --- .../da/workFlow/entity/BusProcessEvaluationHis.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/entity/BusProcessEvaluationHis.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/entity/BusProcessEvaluationHis.java index e70c9bb3..e8597c46 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/workFlow/entity/BusProcessEvaluationHis.java +++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/entity/BusProcessEvaluationHis.java @@ -70,9 +70,21 @@ public class BusProcessEvaluationHis implements Serializable { @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") private String updateTime; + @ApiModelProperty(value = "onlyOffice 是否编辑 0 未编辑 1 已编辑") + @TableField("EDIT_STATUS") + private String editStatus; + + @ApiModelProperty(value = "onlyOffice 编辑文件存储路径") + @TableField("EDIT_FILE_PATH") + private String editFilePath; + @ApiModelProperty(value = "逻辑状态") @TableField("FLAG") private String flag; + @ApiModelProperty(value = "onlyOffice 访问编辑文件全路径") + @TableField(exist = false) + private String downLoadUrl; + } From e814c496d58825f6135ecfca1f19e501c7ddab37 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Wed, 15 Dec 2021 09:09:22 +0800 Subject: [PATCH 11/12] feat: There is no way the, --- .../src/main/java/com/adc/da/login/security/WebMvcConfig.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 058ac857..492c5ea8 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 @@ -99,6 +99,6 @@ public class WebMvcConfig implements WebMvcConfigurer { // // 添加自定义拦截器，并拦截对应 url -// addInterceptor.addPathPatterns("/**"); + addInterceptor.addPathPatterns("/**"); } } From 99f33ac21839115141116ee45c6bf2a72084bd01 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Wed, 15 Dec 2021 10:14:45 +0800 Subject: [PATCH 12/12] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E7=BB=84=20=E5=8D=95?= =?UTF-8?q?=E4=BD=8D=E4=B8=8D=E5=9B=9E=E6=98=BEbug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/adc/da/slrs/wgDept/entity/WgDeptShow.java | 6 +++--- .../java/com/adc/da/slrs/wgNetInfo/entity/WgNetInfoDTO.java | 6 +++--- .../main/resources/mybatis/mapper/wgDept/WgDeptMapper.xml | 4 ++-- .../wgMeetingUserRelation/WgMeetingUserRelationMapper.xml | 2 +- .../resources/mybatis/mapper/wgNetInfo/WgNetInfoMapper.xml | 5 +++-- 5 files changed, 12 insertions(+), 11 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgDept/entity/WgDeptShow.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgDept/entity/WgDeptShow.java index db6423e3..5711d5a0 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgDept/entity/WgDeptShow.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgDept/entity/WgDeptShow.java @@ -54,11 +54,11 @@ public class WgDeptShow extends BaseEntity { @ApiModelProperty(value = "中文名") private String name; - @ApiModelProperty(value = "单位") + @ApiModelProperty(value = "单位名称") private String unit; - @ApiModelProperty(value = "单位名称") - private String unitName; + @ApiModelProperty(value = "单位") + private String unitId; @ApiModelProperty(value = "电话") private String phone; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgNetInfo/entity/WgNetInfoDTO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgNetInfo/entity/WgNetInfoDTO.java index cdf47254..2b2e48a8 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgNetInfo/entity/WgNetInfoDTO.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgNetInfo/entity/WgNetInfoDTO.java @@ -48,11 +48,11 @@ public class WgNetInfoDTO extends BaseEntity { @ApiModelProperty(value = "中文名") private String name; - @ApiModelProperty(value = "单位") + @ApiModelProperty(value = "单位名称") private String unit; - @ApiModelProperty(value = "单位名称") - private String unitName; + @ApiModelProperty(value = "单位") + private String unitId; @ApiModelProperty(value = "电话") private String phone; diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/wgDept/WgDeptMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/wgDept/WgDeptMapper.xml index 6a3e67df..2cc02e2e 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/wgDept/WgDeptMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/wgDept/WgDeptMapper.xml @@ -12,8 +12,8 @@ - select wg_meeting_user_relation.*,ts_user.UNAME as name from wg_meeting_user_relation + select wg_meeting_user_relation.*,concat(ts_user.UNAME,concat('(',concat(ts_user.USID,')'))) as name from wg_meeting_user_relation left join ts_user on ts_user.ACCOUNT = wg_meeting_user_relation.user_id left join wg_meeting_info on wg_meeting_info.id = wg_meeting_user_relation.meeting_id left join wg_work_group on wg_work_group.id = wg_meeting_info.wg_id diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/wgNetInfo/WgNetInfoMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/wgNetInfo/WgNetInfoMapper.xml index 0d2d005c..97768a6b 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/wgNetInfo/WgNetInfoMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/wgNetInfo/WgNetInfoMapper.xml @@ -11,11 +11,12 @@