DZ/faw-report-library-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'lixuetao'

Browse Source
This commit is contained in:
bupengxiang
2023-05-16 11:48:07 +08:00
parent be297b9c31 7e02e430d9
commit 882053a6df
21 changed files with 56 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-report/src/main/java/com/adc/da/report/service/impl/IReportServiceImpl.java
+2 -2
View File
@@ -457,7 +457,7 @@ public class IReportServiceImpl extends ServiceImpl<ReportDao, ReportEntity>
//设置权限
UserEO userEo = userEODao.selectById(UserUtils.getUserId());
String levelId = userEo.getLevelId() == null ? "1.0" : userEo.getLevelId();
String levelId = userEo.getLevelId() == null ? "0.8" : userEo.getLevelId();
//用户级别
double level = Double.parseDouble(levelId);
//总监拥有全部报告的预览和下载权力
@@ -717,7 +717,7 @@ public class IReportServiceImpl extends ServiceImpl<ReportDao, ReportEntity>
});
}
UserEO userEo = userEODao.selectById(UserUtils.getUserId());
String levelId = userEo.getLevelId() == null ? "1.0" : userEo.getLevelId();
String levelId = userEo.getLevelId() == null ? "0.8" : userEo.getLevelId();
//用户级别
double level = Double.parseDouble(levelId);
if (level <= 0.5) {
adc-da-report/src/main/java/com/adc/da/report/vo/ReportDetailVo.java
+6
View File
@@ -5,6 +5,7 @@ import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.experimental.Accessors;
import java.util.Date;
import java.util.List;
/**
@@ -105,4 +106,9 @@ public class ReportDetailVo {
* 标签列表名
*/
private List<String> labels;
/**
* 保密到期日期
*/
private Date secrecyLast;
}
adc-da-report/src/main/resources/mybatis/mapper/mysql/ReportManageMapper.xml
+2 -1
View File
@@ -286,7 +286,8 @@
rm.fileId AS fileId,
f.file_name as fileName,
rm.confidentialLevel AS confidentialLevel,
rm.privacyLevel AS privacyLevel
rm.privacyLevel AS privacyLevel,
rm.secrecy_last AS secrecyLast
FROM `tt_report_manage` AS rm
LEFT JOIN ts_user AS u ON u.USID = rm.createUserId
LEFT JOIN ts_org as org on org.id = rm.department
adc-da-sys/src/main/java/com/adc/da/sys/controller/UserEOController.java
+7 -25
View File
@@ -4,10 +4,8 @@ import com.adc.da.base.web.BaseController;
import com.adc.da.excel.poi.excel.ExcelImportUtil;
import com.adc.da.excel.poi.excel.entity.ImportParams;
import com.adc.da.sys.constant.SysConstants;
import com.adc.da.sys.dao.mysql.UserOrgEODao;
import com.adc.da.sys.entity.OrgEO;
import com.adc.da.sys.entity.UserEO;
import com.adc.da.sys.entity.UserOrgEO;
import com.adc.da.sys.service.iservice.IUserEoService;
import com.adc.da.sys.util.EncryptUtil;
import com.adc.da.sys.util.RSAUtil;
@@ -15,9 +13,9 @@ import com.adc.da.sys.vo.UserImportVO;
import com.adc.da.sys.vo.UserVO;
import com.adc.da.util.http.ResponseMessage;
import com.adc.da.util.http.Result;
import com.adc.da.util.utils.CollectionUtils;
import com.adc.da.util.utils.FileUtil;
import com.adc.da.util.utils.StringUtils;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.google.gson.Gson;
import com.google.gson.JsonElement;
@@ -26,7 +24,6 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.codec.binary.Base64;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
@@ -53,9 +50,6 @@ public class UserEOController extends BaseController<UserEO> {
@Resource
private IUserEoService userEOService;
@Autowired
private UserOrgEODao userOrgEODao;
@Value("${isPassEncrypted}")
private boolean isPassEncrypted;
@@ -121,22 +115,7 @@ public class UserEOController extends BaseController<UserEO> {
userEOService.save(eo);
//保存部门
LambdaQueryWrapper<UserOrgEO> userOrgEOLambdaQueryWrapper = new LambdaQueryWrapper<>();
userOrgEOLambdaQueryWrapper.eq(UserOrgEO::getUserId,eo.getUsid());
userOrgEODao.delete(userOrgEOLambdaQueryWrapper);
String orgId = eo.getOrgId();
if (StringUtils.isNotEmpty(orgId)){
String[] split = orgId.split(",");
List<UserOrgEO> userOrgEOS = new ArrayList<>();
for (String s : split) {
UserOrgEO userOrgEO = new UserOrgEO();
userOrgEO.setUserId(eo.getUsid());
userOrgEO.setOrgId(s);
userOrgEOS.add(userOrgEO);
}
userOrgEODao.insertBatch(userOrgEOS);
}
return Result.success();
}
@@ -245,9 +224,12 @@ public class UserEOController extends BaseController<UserEO> {
@ApiOperation(value = "查询自己领导")
@GetMapping("getOwnLeader")
public ResponseMessage getOwnLeader(String userId){
UserEO userEoById = userEOService.getUserEoById(userId);
UserVO userEoById = userEOService.getUserEoById(userId);
List<OrgEO> orgEOList = userEoById.getOrgEOList();
List<UserEO> leaderList = userEOService.getOwnLeader(orgEOList);
List<UserEO> leaderList = new ArrayList<>();
if (CollectionUtils.isNotEmpty(orgEOList)){
leaderList = userEOService.getOwnLeader(orgEOList);
}
return Result.success(leaderList);
}
}
adc-da-sys/src/main/java/com/adc/da/sys/dao/mysql/UserEODao.java
+2 -2
View File
@@ -42,9 +42,9 @@ public interface UserEODao extends BaseMapper<UserEO> {
List<Map<String, Object>> allList( @Param("account") String account, @Param("roleName") String roleName);
UserEO getUserEoById(@Param("usid") String usid);
UserVO getUserEoById(@Param("usid") String usid);
UserEO selectUserByIdNodel(String userId);
UserVO selectUserByIdNodel(String userId);
List<UserEO> getOwnLeader(@Param("Vo") List<OrgEO> orgEOList);
}
adc-da-sys/src/main/java/com/adc/da/sys/service/UserEOServiceImpl.java
+3 -3
View File
@@ -185,8 +185,8 @@ public class UserEOServiceImpl implements IUserEoService {
}
@Override
public UserEO getUserEoById(String usid) {
UserEO userEO = dao.getUserEoById(usid);
public UserVO getUserEoById(String usid) {
UserVO userEO = dao.getUserEoById(usid);
return userEO;
}
@@ -328,7 +328,7 @@ public class UserEOServiceImpl implements IUserEoService {
}
@Override
public UserEO getUserByIdNodel(String userId) {
public UserVO getUserByIdNodel(String userId) {
return dao.selectUserByIdNodel(userId);
}
adc-da-sys/src/main/java/com/adc/da/sys/service/iservice/IUserEoService.java
+2 -2
View File
@@ -36,7 +36,7 @@ public interface IUserEoService {
UserEO getUserById(String usid);
UserEO getUserEoById(String usid);
UserVO getUserEoById(String usid);
List<UserVO> getUserByIdList(List<String> userIdList);
@@ -67,7 +67,7 @@ public interface IUserEoService {
* @param userId
* @return
*/
UserEO getUserByIdNodel(String userId);
UserVO getUserByIdNodel(String userId);
List<UserEO> getOwnLeader(List<OrgEO> orgEOList);
}
adc-da-sys/src/main/resources/mybatis/mapper/sys/mysql/UserEOMapper.xml
+6 -6
View File
@@ -184,7 +184,7 @@
#{id}
</foreach>
</select>
<select id="getUserEoById" resultType="com.adc.da.sys.entity.UserEO">
<select id="getUserEoById" resultMap="UserDetailMap">
select
users.usid,
users.usname,
@@ -201,13 +201,13 @@
o.bmdm_14 as o_bmdm14
from TS_USER users
left join TR_USER_ROLE ur on users.usid = ur.user_id
left join TS_ROLE r on ur.role_id = r.id
left join TS_ROLE r on ur.role_id = r.id and r.del_flag = 0
left join TR_USER_ORG uo on users.usid = uo.user_id
left join TS_ORG o on uo.org_id = o.org_code
left join TS_ORG o on uo.org_id = o.org_code and o.status = 1
where users.del_flag != 1
and users.usid=#{usid}
</select>
<select id="selectUserByIdNodel" resultType="com.adc.da.sys.entity.UserEO">
<select id="selectUserByIdNodel" resultMap="UserDetailMap">
select
users.usid,
users.usname,
@@ -230,7 +230,7 @@
where users.usid=#{usid}
</select>
<select id="getUserByIdListNodel" resultType="com.adc.da.sys.vo.UserVO">
<select id="getUserByIdListNodel" resultMap="UserDetailMap">
select
users.usid,
@@ -262,7 +262,7 @@
<where>
uo.org_id in
<foreach collection="Vo" item="item" open="(" separator="," close=")">
#{item.Id}
#{item.id}
</foreach>
and (u.level_id=5 or u.level_id=9) and u.employee_type_id = 1
</where>
adc-da-sys/target/classes/com/adc/da/sys/controller/UserEOController.class
BIN
View File
Binary file not shown.
adc-da-sys/target/classes/com/adc/da/sys/dao/mysql/UserEODao.class
BIN
View File
Binary file not shown.
adc-da-sys/target/classes/com/adc/da/sys/service/UserEOServiceImpl.class
BIN
View File
Binary file not shown.
adc-da-sys/target/classes/com/adc/da/sys/service/iservice/IUserEoService.class
BIN
View File
Binary file not shown.
adc-da-sys/target/classes/mybatis/mapper/sys/mysql/UserEOMapper.xml
+6 -6
View File
@@ -184,7 +184,7 @@
#{id}
</foreach>
</select>
<select id="getUserEoById" resultType="com.adc.da.sys.entity.UserEO">
<select id="getUserEoById" resultMap="UserDetailMap">
select
users.usid,
users.usname,
@@ -201,13 +201,13 @@
o.bmdm_14 as o_bmdm14
from TS_USER users
left join TR_USER_ROLE ur on users.usid = ur.user_id
left join TS_ROLE r on ur.role_id = r.id
left join TS_ROLE r on ur.role_id = r.id and r.del_flag = 0
left join TR_USER_ORG uo on users.usid = uo.user_id
left join TS_ORG o on uo.org_id = o.org_code
left join TS_ORG o on uo.org_id = o.org_code and o.status = 1
where users.del_flag != 1
and users.usid=#{usid}
</select>
<select id="selectUserByIdNodel" resultType="com.adc.da.sys.entity.UserEO">
<select id="selectUserByIdNodel" resultMap="UserDetailMap">
select
users.usid,
users.usname,
@@ -230,7 +230,7 @@
where users.usid=#{usid}
</select>
<select id="getUserByIdListNodel" resultType="com.adc.da.sys.vo.UserVO">
<select id="getUserByIdListNodel" resultMap="UserDetailMap">
select
users.usid,
@@ -262,7 +262,7 @@
<where>
uo.org_id in
<foreach collection="Vo" item="item" open="(" separator="," close=")">
#{item.Id}
#{item.id}
</foreach>
and (u.level_id=5 or u.level_id=9) and u.employee_type_id = 1
</where>
report-activity/src/main/java/com/adc/da/wkflow/business_activiti/task/TaskController.java
+6 -3
View File
@@ -87,7 +87,7 @@ public class TaskController {
BusProcessNew processNew = iBusProcessNewService.getOne(processNewQueryWrapper);
if(processNew!=null){
UserEO assignee = userEoService.getUserByIdNodel(processNew.getUserId());
UserVO assignee = userEoService.getUserByIdNodel(processNew.getUserId());
if(assignee != null){
historicTaskInstance.put("assignee", assignee.getUsname());
historicTaskInstance.put("assigneeId", assignee.getUsid());
@@ -101,7 +101,7 @@ public class TaskController {
historicTaskInstance.put("assignee", assignee.getUsname());
historicTaskInstance.put("assigneeId", assignee.getUsid());
if(assignee.getOrgEOList().size()>0){
historicTaskInstance.put("orgName",assignee.getOrgEOList().get(0));
historicTaskInstance.put("orgName",assignee.getOrgEOList().get(0).getOrgName());
}
QueryWrapper queryWrapper2 = new QueryWrapper();
queryWrapper2.eq("TASK_ID",historicTaskInstance.get("id"));
@@ -115,8 +115,11 @@ public class TaskController {
HashMap<String, Object> map = new HashMap<>();
UserEO assigneenActual = userEoService.getUserById(busProcessEntrust.getUserId());
String consigner = assigneenActual.getUsname();
UserEO userById = userEoService.getUserById(busProcessEntrust.getEnUserId());
UserVO userById = userEoService.getUserByIdNodel(busProcessEntrust.getEnUserId());
String enUserName = userById.getUsname();
if(userById.getOrgEOList().size()>0){
map.put("orgName",userById.getOrgEOList().get(0).getOrgName());
}
map.put("assignee", enUserName+"(" + consigner + " 委托)");
map.put("assigneeId", busProcessEntrust.getEnUserId());
map.put("prcType",one.getPrcType());
report-activity/src/main/java/com/adc/da/wkflow/business_activiti/task/TodoTaskController.java
+8 -4
View File
@@ -283,10 +283,14 @@ public class TodoTaskController {
@ApiImplicitParams({@ApiImplicitParam(name = "taskId", value = "任务id"),
@ApiImplicitParam(name = "assignee", value = "被改派人员"), @ApiImplicitParam(name = "userId", value = "改派人员"),
@ApiImplicitParam(name = "pId", value = "流程实例ID")})
@GetMapping("/changeAssigneeNew")
public Wrapper<String> changeAssigneeNew(String taskId, String assignee, String userId, String pId,
@RequestParam(required = false,value = "replaceMap")String replaceMap,
String approvalOpinion) {
@PostMapping("/changeAssigneeNew")
public Wrapper<String> changeAssigneeNew(@RequestBody BusProcessEntrust busProcessEntrustEO) {
String assignee = busProcessEntrustEO.getAssignee();
String taskId = busProcessEntrustEO.getTaskId();
String pId = busProcessEntrustEO.getPrcId();
String userId = busProcessEntrustEO.getUserId();
String approvalOpinion = busProcessEntrustEO.getApprovalOpinion();
String replaceMap = busProcessEntrustEO.getReplaceMap();
List<String> list = Arrays.asList(taskId.split(","));
for (String str : list) {
report-activity/src/main/java/com/adc/da/wkflow/business_main/entity/BusProcessEntrust.java
+6
View File
@@ -67,4 +67,10 @@ public class BusProcessEntrust implements Serializable {
@TableField("APPROVAL_OPINION")
private String approvalOpinion;
@TableField(exist = false)
private String replaceMap;
@TableField(exist = false)
private String assignee;
}
report-activity/target/classes/com/adc/da/wkflow/business_activiti/task/TaskController$1.class
BIN
View File
Binary file not shown.
report-activity/target/classes/com/adc/da/wkflow/business_activiti/task/TaskController.class
BIN
View File
Binary file not shown.
report-activity/target/classes/com/adc/da/wkflow/business_activiti/task/TodoTaskController$1.class
BIN
View File
Binary file not shown.
report-activity/target/classes/com/adc/da/wkflow/business_activiti/task/TodoTaskController.class
BIN
View File
Binary file not shown.
report-activity/target/classes/com/adc/da/wkflow/business_main/entity/BusProcessEntrust.class
BIN
View File
Binary file not shown.