From 41f3aec37e26427795bae3045a6aee4bbb2dc504 Mon Sep 17 00:00:00 2001 From: bupengxiang Date: Wed, 17 May 2023 10:57:38 +0800 Subject: [PATCH 1/4] =?UTF-8?q?[=E4=BF=AE=E6=94=B9]=20=E4=BF=9D=E5=AD=98?= =?UTF-8?q?=E5=88=B0=E8=8D=89=E7=A8=BF=20=E5=9B=A0dataId=E5=BC=95=E8=B5=B7?= =?UTF-8?q?=E7=9A=84=E5=81=B6=E7=8E=B0=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/adc/da/report/eo/TtReportManageAct.java | 6 ++++++ .../mybatis/mapper/mysql/TtReportManageActMapper.xml | 11 ++++++++--- .../service/ActivitDefineService.java | 7 +++++++ 3 files changed, 21 insertions(+), 3 deletions(-) diff --git a/adc-da-report/src/main/java/com/adc/da/report/eo/TtReportManageAct.java b/adc-da-report/src/main/java/com/adc/da/report/eo/TtReportManageAct.java index cf7a689..e6fa1af 100644 --- a/adc-da-report/src/main/java/com/adc/da/report/eo/TtReportManageAct.java +++ b/adc-da-report/src/main/java/com/adc/da/report/eo/TtReportManageAct.java @@ -40,6 +40,12 @@ public class TtReportManageAct { @TableField("data_id") private String dataId; + /** + * 报告id + */ + @TableField("report_id") + private String reportId; + /** * 报告名 */ diff --git a/adc-da-report/src/main/resources/mybatis/mapper/mysql/TtReportManageActMapper.xml b/adc-da-report/src/main/resources/mybatis/mapper/mysql/TtReportManageActMapper.xml index 7df639f..3047e60 100644 --- a/adc-da-report/src/main/resources/mybatis/mapper/mysql/TtReportManageActMapper.xml +++ b/adc-da-report/src/main/resources/mybatis/mapper/mysql/TtReportManageActMapper.xml @@ -8,6 +8,7 @@ + @@ -33,7 +34,8 @@ id, - task_id, prc_id, data_id, name, keycontent, maincontent, department, year, fileId, confidentialLevel, privacyLevel, createUserId, createDate, updateDate, del_flag + task_id, prc_id, data_id,report_id ,name, keycontent, maincontent, department, year, fileId, confidentialLevel, + privacyLevel, createUserId, createDate, updateDate, del_flag ,secrecy_last,file_name @@ -51,6 +53,9 @@ AND data_id LIKE CONCAT(CONCAT('%',#{pageVO.dataId}),'%') + + AND report_id LIKE CONCAT(CONCAT('%',#{pageVO.reportId}),'%') + AND name LIKE CONCAT(CONCAT('%',#{pageVO.name}),'%') @@ -128,7 +133,7 @@ SELECT a.id, - task_id, prc_id, data_id, name, keycontent, maincontent, department, + task_id, prc_id, data_id,report_id, name, keycontent, maincontent, department, org.LONG_NAME as departmentName, year, fileId, confidentialLevel, privacyLevel, createUserId, createDate, updateDate, del_flag ,secrecy_last,file_name diff --git a/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/service/ActivitDefineService.java b/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/service/ActivitDefineService.java index 375a2cb..dacca21 100644 --- a/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/service/ActivitDefineService.java +++ b/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/service/ActivitDefineService.java @@ -51,6 +51,13 @@ public class ActivitDefineService { if (StringUtils.isBlank(reportId)){ reportId = UUID.randomUUID().toString().replace("-",""); } + /** + * prcId为空时,是指保存到草稿 ，dataJson是有reportId的, + * 此时 给reportId一个唯一值，是为了付给 dataId + */ + if (StringUtils.isBlank(prcId)){ + reportId = UUID.randomUUID().toString().replace("-",""); + } if ("".equals(prcType)){ // 保存到草稿 ，没有选择 要申请的权限 PowerApplyAct powerApplyAct = JSONObject.parseObject(dataJson, PowerApplyAct.class); From b5b48c16c2354f0fe27abe7f89f6b67654d7a722 Mon Sep 17 00:00:00 2001 From: bupengxiang Date: Wed, 17 May 2023 11:24:12 +0800 Subject: [PATCH 2/4] =?UTF-8?q?[=E4=BF=AE=E6=94=B9]=20=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E5=AF=BC=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../adc/da/sys/service/UserEOServiceImpl.java | 23 +++++++++--------- .../java/com/adc/da/sys/vo/UserImportVO.java | 8 ++---- .../mybatis/mapper/sys/mysql/UserEOMapper.xml | 1 + .../main/resources/template/用户导入模板.xlsx | Bin 9018 -> 8967 bytes 4 files changed, 15 insertions(+), 17 deletions(-) diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/service/UserEOServiceImpl.java b/adc-da-sys/src/main/java/com/adc/da/sys/service/UserEOServiceImpl.java index f640675..9aac281 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sys/service/UserEOServiceImpl.java +++ b/adc-da-sys/src/main/java/com/adc/da/sys/service/UserEOServiceImpl.java @@ -114,14 +114,15 @@ public class UserEOServiceImpl implements IUserEoService { userRoleEO.setRoleId(c); userRoleEODao.insert(userRoleEO); }); - - String[] split = eo.getOrgId().split(","); - // 插入组织关联表 暂时用不上,页面不维护组织机构 - for (String s : split) { - UserOrgEO userOrgEO = new UserOrgEO(); - userOrgEO.setUserId(eo.getUsid()); - userOrgEO.setOrgId(s); - userOrgEODao.insert(userOrgEO); + if (StringUtils.isNotEmpty(eo.getOrgId())){ + String[] split = eo.getOrgId().split(","); + // 插入组织关联表 暂时用不上,页面不维护组织机构 + for (String s : split) { + UserOrgEO userOrgEO = new UserOrgEO(); + userOrgEO.setUserId(eo.getUsid()); + userOrgEO.setOrgId(s); + userOrgEODao.insert(userOrgEO); + } } } @@ -387,9 +388,9 @@ public class UserEOServiceImpl implements IUserEoService { if (StringUtils.isEmpty(userImportVO.getOperation())) { throw new AdcDaBaseException("第"+(i+1)+"行"+"操作（add添加、full覆盖角色）不能为空"); } - if (StringUtils.isEmpty(userImportVO.getIsUse())) { - throw new AdcDaBaseException("第"+(i+1)+"行"+"是否启用不能为空"); - } +// if (StringUtils.isEmpty(userImportVO.getIsUse())) { +// throw new AdcDaBaseException("第"+(i+1)+"行"+"是否启用不能为空"); +// } if (!roleEOMap.keySet().contains(userImportVO.getRoleName())) { throw new AdcDaBaseException("第"+(i+1)+"行"+"角色：" + userImportVO.getRoleName() + "不存在，请检查"); } diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/vo/UserImportVO.java b/adc-da-sys/src/main/java/com/adc/da/sys/vo/UserImportVO.java index a0fadea..7aaf92a 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sys/vo/UserImportVO.java +++ b/adc-da-sys/src/main/java/com/adc/da/sys/vo/UserImportVO.java @@ -3,9 +3,6 @@ package com.adc.da.sys.vo; import com.adc.da.excel.annotation.Excel; import lombok.Data; -import java.util.ArrayList; -import java.util.List; - @Data public class UserImportVO { @@ -51,9 +48,8 @@ public class UserImportVO { private String updateTime; - - @Excel(name = "是否启用（0禁用、1启用）", width = 20) - private String isUse; +// @Excel(name = "是否启用（0禁用、1启用）", width = 20) +// private String isUse; @Excel(name = "姓名", width = 20) private String usname; diff --git a/adc-da-sys/src/main/resources/mybatis/mapper/sys/mysql/UserEOMapper.xml b/adc-da-sys/src/main/resources/mybatis/mapper/sys/mysql/UserEOMapper.xml index f32664d..4de06e6 100644 --- a/adc-da-sys/src/main/resources/mybatis/mapper/sys/mysql/UserEOMapper.xml +++ b/adc-da-sys/src/main/resources/mybatis/mapper/sys/mysql/UserEOMapper.xml @@ -266,6 +266,7 @@ #{item.id} and (u.level_id=5 or u.level_id=9) and u.employee_type_id = 1 + and u.del_flag = 0 diff --git a/adc-da-sys/src/main/resources/template/用户导入模板.xlsx b/adc-da-sys/src/main/resources/template/用户导入模板.xlsx index 6ac697b7e6984d171203a9334ca4c3a2ead33670..a7cc340a47087f3c6078805fdf18be81cc1da4d3 100644 GIT binary patch delta 4915 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 From e6379e6ae7d2df72225dc98c90f64f54262bfc29 Mon Sep 17 00:00:00 2001 From: Mzaxd Date: Wed, 17 May 2023 11:37:36 +0800 Subject: [PATCH 3/4] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E9=A2=84=E8=A7=88?= =?UTF-8?q?=E4=B8=8B=E8=BD=BD=E6=9D=83=E9=99=90=E6=98=BE=E7=A4=BA=E4=B8=8D?= =?UTF-8?q?=E6=AD=A3=E7=A1=AE=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../da/report/service/impl/IReportServiceImpl.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/adc-da-report/src/main/java/com/adc/da/report/service/impl/IReportServiceImpl.java b/adc-da-report/src/main/java/com/adc/da/report/service/impl/IReportServiceImpl.java index cb2a486..049c671 100644 --- a/adc-da-report/src/main/java/com/adc/da/report/service/impl/IReportServiceImpl.java +++ b/adc-da-report/src/main/java/com/adc/da/report/service/impl/IReportServiceImpl.java @@ -463,9 +463,9 @@ public class IReportServiceImpl extends ServiceImpl double level = Double.parseDouble(levelId); double employeeType = Double.parseDouble(employeeTypeId); //总监拥有全部报告的预览和下载权力 - if (level == SPECIAL_LEVEL_ONE || level == SPECIAL_LEVEL_TWO || - level == SPECIAL_LEVEL_THREE || level == SPECIAL_LEVEL_FOUL || - employeeType == EMPLOYEE_TYPE_ID_ONE) { + if ((level == SPECIAL_LEVEL_ONE || level == SPECIAL_LEVEL_TWO || + level == SPECIAL_LEVEL_THREE || level == SPECIAL_LEVEL_FOUL) && + (employeeType == EMPLOYEE_TYPE_ID_ONE)) { list.getRecords().forEach(reportVo -> { reportVo.setPower(PREVIEW_DOWNLOAD); }); @@ -641,9 +641,9 @@ public class IReportServiceImpl extends ServiceImpl double level = Double.parseDouble(levelId); double employeeType = Double.parseDouble(employeeTypeId); //总监拥有全部报告的预览和下载权力 - if (level == SPECIAL_LEVEL_ONE || level == SPECIAL_LEVEL_TWO || - level == SPECIAL_LEVEL_THREE || level == SPECIAL_LEVEL_FOUL || - employeeType == EMPLOYEE_TYPE_ID_ONE) { + if ((level == SPECIAL_LEVEL_ONE || level == SPECIAL_LEVEL_TWO || + level == SPECIAL_LEVEL_THREE || level == SPECIAL_LEVEL_FOUL) && + (employeeType == EMPLOYEE_TYPE_ID_ONE)) { return true; } //本人 From be5c2ff02c78cb5ce52b0ae866e852b425829f00 Mon Sep 17 00:00:00 2001 From: bupengxiang Date: Wed, 17 May 2023 15:37:35 +0800 Subject: [PATCH 4/4] =?UTF-8?q?[=E4=BF=AE=E6=94=B9]=20=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E5=85=A8=E9=83=A8=E7=94=A8=E6=88=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../da/report/vo/TtReportManageActPageVO.java | 1 + .../com/adc/da/sys/dao/mysql/UserEODao.java | 7 ++-- .../adc/da/sys/service/UserEOServiceImpl.java | 9 +++-- .../mybatis/mapper/sys/mysql/OrgEOMapper.xml | 2 +- .../mybatis/mapper/sys/mysql/UserEOMapper.xml | 34 ++++++++++++++----- .../task/TaskController.java | 22 ++++++------ 6 files changed, 51 insertions(+), 24 deletions(-) diff --git a/adc-da-report/src/main/java/com/adc/da/report/vo/TtReportManageActPageVO.java b/adc-da-report/src/main/java/com/adc/da/report/vo/TtReportManageActPageVO.java index 6b63355..2583b3b 100644 --- a/adc-da-report/src/main/java/com/adc/da/report/vo/TtReportManageActPageVO.java +++ b/adc-da-report/src/main/java/com/adc/da/report/vo/TtReportManageActPageVO.java @@ -32,6 +32,7 @@ public class TtReportManageActPageVO extends BasePageVO { */ private String dataId; + private String reportId; /** * */ diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/dao/mysql/UserEODao.java b/adc-da-sys/src/main/java/com/adc/da/sys/dao/mysql/UserEODao.java index 4429887..fc74d38 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sys/dao/mysql/UserEODao.java +++ b/adc-da-sys/src/main/java/com/adc/da/sys/dao/mysql/UserEODao.java @@ -4,7 +4,6 @@ import com.adc.da.sys.entity.OrgEO; import com.adc.da.sys.entity.UserEO; import com.adc.da.sys.vo.UserVO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -22,7 +21,9 @@ import java.util.Map; */ public interface UserEODao extends BaseMapper { - IPage> list(IPage page, @Param("account") String account, @Param("roleName") String roleName); + List> list(@Param("current")int current ,@Param("size") int size , + @Param("account") String account, + @Param("roleName") String roleName); /** * 查询用户及用户所对应的角色 @@ -47,4 +48,6 @@ public interface UserEODao extends BaseMapper { UserVO selectUserByIdNodel(String userId); List getOwnLeader(@Param("Vo") List orgEOList); + + long listCount(@Param("account") String account, @Param("roleName") String roleName); } diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/service/UserEOServiceImpl.java b/adc-da-sys/src/main/java/com/adc/da/sys/service/UserEOServiceImpl.java index 9aac281..e616a1a 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sys/service/UserEOServiceImpl.java +++ b/adc-da-sys/src/main/java/com/adc/da/sys/service/UserEOServiceImpl.java @@ -203,10 +203,15 @@ public class UserEOServiceImpl implements IUserEoService { @Override public IPage> list(int pageNo, int pageSize, String account, String roleName) { IPage page = new Page(); + int i = pageNo - 1 ; + int current = i == 0 ? 0 : i * pageSize; page.setCurrent(pageNo); page.setSize(pageSize); - IPage> list = dao.list(page, account, roleName); - return list; + List> list = dao.list(current, pageSize, account, roleName); + long count = dao.listCount(account,roleName); + page.setTotal(count); + page.setRecords(list); + return page; } @Override diff --git a/adc-da-sys/src/main/resources/mybatis/mapper/sys/mysql/OrgEOMapper.xml b/adc-da-sys/src/main/resources/mybatis/mapper/sys/mysql/OrgEOMapper.xml index 6f1d967..1093a10 100644 --- a/adc-da-sys/src/main/resources/mybatis/mapper/sys/mysql/OrgEOMapper.xml +++ b/adc-da-sys/src/main/resources/mybatis/mapper/sys/mysql/OrgEOMapper.xml @@ -5,7 +5,7 @@ - and DEPARTMENT_CODE = #{pageVO.departmentCode} + and DEPARTMENT_CODE LIKE CONCAT(CONCAT('%',#{pageVO.departmentCode}),'%') and LONG_NAME LIKE CONCAT(CONCAT('%',#{pageVO.longName}) ,'%') diff --git a/adc-da-sys/src/main/resources/mybatis/mapper/sys/mysql/UserEOMapper.xml b/adc-da-sys/src/main/resources/mybatis/mapper/sys/mysql/UserEOMapper.xml index 4de06e6..68a3a34 100644 --- a/adc-da-sys/src/main/resources/mybatis/mapper/sys/mysql/UserEOMapper.xml +++ b/adc-da-sys/src/main/resources/mybatis/mapper/sys/mysql/UserEOMapper.xml @@ -7,25 +7,40 @@ date_format(t1.UPDATE_TIME,'%Y-%m-%d %H:%i:%S')CREATEDATE, GROUP_CONCAT( DISTINCT org.ID ) as ORGID, GROUP_CONCAT( DISTINCT org.LONG_NAME )as ORGNAME - from TS_USER t1 + from + ( + select * from TS_USER + where del_flag = 0 + + and ACCOUNT like CONCAT('%',CONCAT(#{account},'%')) + + + and NAME like CONCAT('%',CONCAT(#{roleName},'%')) + + ORDER BY UPDATE_TIME DESC + LIMIT #{current},#{size} + ) t1 left join TR_USER_ROLE t2 on t1.USID=t2.USER_ID left JOIN TS_ROLE t3 on t2.ROLE_ID=t3.ID left JOIN tr_user_org uo on t1.usid= uo.user_id left JOIN ts_org org on uo.org_id = org.id - where t1.del_flag='0' - - and t1.ACCOUNT like "%"#{account}"%" - - - - and t3.NAME like "%"#{roleName}"%" - GROUP BY t1.USID ORDER BY t1.UPDATE_TIME DESC )tt + +