From 1edd95bccc18e39692c615f6a61857f1900bc787 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Tue, 7 Dec 2021 15:19:55 +0800 Subject: [PATCH] =?UTF-8?q?Ocr=E9=83=A8=E5=88=86bug=20=E5=92=8C=E5=B7=A5?= =?UTF-8?q?=E4=BD=9C=E7=BB=84=E9=83=A8=E5=88=86bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../adc/da/FeignClient/workFlowFeignClient.java | 2 +- .../workFlow/controller/WorkFlowController.java | 2 +- .../da/workFlow/entity/ProcessDetailExport.java | 2 +- .../da/slrs/sarInstitution/entity/TsUserVO.java | 8 ++++++++ .../sarStandIdea/dao/SarPublicIdeaAllDao.java | 5 +++++ .../Impl/SarPublicIdeaAllServiceImpl.java | 11 +++++++---- .../com/adc/da/slrs/wgDept/entity/WgDept.java | 7 +++++++ .../adc/da/slrs/wgNetInfo/entity/WgNetInfo.java | 9 +++++++++ .../sarInstitution/TsInstitutionMapper.xml | 6 ++++-- .../sarStandIdea/SarPublicIdeaAllMapper.xml | 17 +++++++++++++++++ .../mybatis/mapper/wgDept/WgDeptMapper.xml | 10 ++++++---- .../mapper/wgNetInfo/WgNetInfoMapper.xml | 4 ++-- .../da/ocr/controller/OCRRestfulController.java | 3 +++ .../java/com/adc/da/ocr/dao/OcrRecordEODao.java | 1 + .../adc/da/ocr/service/OcrRecordEOService.java | 2 ++ .../service/impl/OcrRecordEOServiceImpl.java | 5 +++++ .../mybatis/mapper/ocr/OcrRecordEOMapper.xml | 14 ++++++++++++++ 17 files changed, 93 insertions(+), 15 deletions(-) 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 1a14a949..8316969c 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 @@ -409,6 +409,6 @@ 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) + @RequestMapping(value = "/bat-wkflow/delCG",method = RequestMethod.POST) String delCG(@RequestParam("id") String 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 4e0b18f7..c77639d5 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 @@ -689,7 +689,7 @@ public class WorkFlowController { } @ApiOperation(value = "草稿删除") - @GetMapping("/delCG") + @PostMapping("/delCG") public String delCG(@RequestParam("id")String id){ return workFlowFeignClient.delCG(id); } diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/entity/ProcessDetailExport.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/entity/ProcessDetailExport.java index 348a6ce5..1cde1409 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/workFlow/entity/ProcessDetailExport.java +++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/entity/ProcessDetailExport.java @@ -15,7 +15,7 @@ public class ProcessDetailExport { private Date startTime; @Excel(name = "完成时间", orderNum = "4",exportFormat = "yyyy/MM/dd",width = 15) private Date endTime; - @Excel(name = "审批意见", orderNum = "5",width = 15) + @Excel(name = "流程信息", orderNum = "5",width = 15) private String comment; @Excel(name = "状态", orderNum = "6",width = 15) private String flag; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/entity/TsUserVO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/entity/TsUserVO.java index 3111f5d9..e33d3e4c 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/entity/TsUserVO.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/entity/TsUserVO.java @@ -118,4 +118,12 @@ public class TsUserVO { @ApiModelProperty(value = "岗位") @TableField(exist = false) private List positions; + + @ApiModelProperty(value = "单位") + @TableField(exist = false) + private String unit; + + @ApiModelProperty(value = "单位Id") + @TableField(exist = false) + private String unitId; } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/dao/SarPublicIdeaAllDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/dao/SarPublicIdeaAllDao.java index 3719ea86..55791c62 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/dao/SarPublicIdeaAllDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/dao/SarPublicIdeaAllDao.java @@ -2,6 +2,7 @@ package com.adc.da.slrs.sarStandIdea.dao; import com.adc.da.slrs.sarStandIdea.entity.SarPublicIdeaAll; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -21,4 +22,8 @@ import java.util.List; public interface SarPublicIdeaAllDao extends BaseMapper { List getPublicIdea(@Param("unique")String unique); + + List getAllDataByIdea(@Param("page")Integer page,@Param("size")Integer size, @Param("ideaId")String ideaId); + + Integer getAllDataByIdeaCount( @Param("ideaId")String ideaId); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/Impl/SarPublicIdeaAllServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/Impl/SarPublicIdeaAllServiceImpl.java index 99547e00..4063dab4 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/Impl/SarPublicIdeaAllServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/Impl/SarPublicIdeaAllServiceImpl.java @@ -48,10 +48,13 @@ public class SarPublicIdeaAllServiceImpl extends ServiceImpl wrapper = new QueryWrapper<>(); - wrapper.eq("idea_id", detAllStandDto.getIdeaId()); - Page page = new Page<>(detAllStandDto.getPage(), detAllStandDto.getSize()); - IPage userIPage = sarPublicIdeaAllDao.selectPage(page, wrapper); + List sarPublicIdeaAlls=sarPublicIdeaAllDao.getAllDataByIdea(detAllStandDto.getPage(),detAllStandDto.getSize(),detAllStandDto.getIdeaId()); + Integer a=sarPublicIdeaAllDao.getAllDataByIdeaCount(detAllStandDto.getIdeaId()); + Page userIPage=new Page(); + userIPage.setTotal(a); + userIPage.setRecords(sarPublicIdeaAlls); + userIPage.setSize(detAllStandDto.getSize()); + userIPage.setCurrent(detAllStandDto.getPage()); System.out.println("总条数" + userIPage.getTotal()); System.out.println("总页数" + userIPage.getPages()); List list = userIPage.getRecords(); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgDept/entity/WgDept.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgDept/entity/WgDept.java index 0566b276..60644bd3 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgDept/entity/WgDept.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgDept/entity/WgDept.java @@ -58,5 +58,12 @@ public class WgDept extends BaseEntity { @TableField("join_id") private String joinId; + @ApiModelProperty(value = "手机号") + @TableField("phone") + private String phone; + + @ApiModelProperty(value = "邮箱") + @TableField("email") + private String email; } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgNetInfo/entity/WgNetInfo.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgNetInfo/entity/WgNetInfo.java index 12b1edec..6ec1cf93 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgNetInfo/entity/WgNetInfo.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgNetInfo/entity/WgNetInfo.java @@ -44,5 +44,14 @@ public class WgNetInfo extends BaseEntity { @TableField("join_id") private String joinId; + @ApiModelProperty(value = "手机号") + @TableField("phone") + private String phone; + + @ApiModelProperty(value = "邮箱") + @TableField("email") + private String email; + + } diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarInstitution/TsInstitutionMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarInstitution/TsInstitutionMapper.xml index d466c37e..cce76150 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarInstitution/TsInstitutionMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarInstitution/TsInstitutionMapper.xml @@ -40,9 +40,11 @@ select ts_user.EMAIL,ts_user.ACCOUNT,ts_user.CREATION_TIME,ts_user.DISABLE_FLAG,ts_user.EXT_INFO,ts_user.USID, ts_user.INSTITUTION_ID,ts_user.INSTITUTION_NAME,ts_user.MODIFY_TIME,ts_user.OPER_USER,ts_user.PASSWORD,ts_user.PHONE, ts_user.POSITION_ID,ts_user.POSITION_NAME,ts_user.SEX,ts_user.SSO_ID,ts_user.STATE,ts_user.UNLOCK_FLAG,ts_user.USER_SOURCE, - ts_user.USER_TYPE,ts_user.VALID_FLAG,ts_user.WORK_NUM,concat(ts_user.UNAME,concat(concat("(",ts_user.ACCOUNT),")")) as uname + ts_user.USER_TYPE,ts_user.VALID_FLAG,ts_user.WORK_NUM,concat(ts_user.UNAME,concat(concat("(",ts_user.ACCOUNT),")")) as uname, + ts_institution.name as unit,ts_institution.id as unitId from ts_user - WHERE institution_id=#{institutionId} + left join ts_institution ON ts_institution.id = (SELECT parent_id from ts_institution WHERE id = ts_user.INSTITUTION_ID) + WHERE institution_id=#{institutionId} and ( ts_user.ACCOUNT like concat(concat('%',#{userName}),'%') or ts_user.UNAME like concat(concat('%',#{userName}),'%') ) 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 8beb3f8a..61e052a0 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 @@ -7,4 +7,21 @@ INNER JOIN sar_public_idea_all on sar_public_idea_all.idea_id = sar_public_idea.id WHERE sar_public_idea_all.idea_id IS NOT NULL and sar_public_idea.uniques = #{unique} + + + + 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 0cef7c6d..6a3e67df 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 @@ -3,19 +3,21 @@ 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 7ed719b5..0d2d005c 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 @@ -3,7 +3,7 @@ + +