WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

法规和认证清单高级搜索责任人和接口人修改

Browse Source
This commit is contained in:
高嵩
2023-05-06 10:38:15 +08:00
parent 7fefb82a03
commit c8fbe590a9
6 changed files with 2729 additions and 2479 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectCertificationInventoryEOController.java
+11
View File
@@ -323,4 +323,15 @@ public class ProjectCertificationInventoryEOController extends JeroController<Pr
public Result<?> addConfigByIds(@RequestBody JSONObject json) {
return this.projectCertificationInventoryEOService.addConfigByIds(json);
}
/**
* 获取责任人和接口人
* @return
*/
@AutoLog(value = "项目库-认证清单表-获取责任人和接口人")
@ApiOperation(value="项目库-认证清单表-获取责任人和接口人", notes="项目库-认证清单表-获取责任人和接口人")
@GetMapping(value = "/queryDutyPersonByProjectId")
public Result<?> queryDutyPersonByProjectId(@RequestParam Map<String,Object> params) {
return Result.OK(this.projectCertificationInventoryEOService.queryDutyPersonByProjectId(params));
}
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLawsInventoryEOController.java
+13
View File
@@ -527,4 +527,17 @@ public class ProjectLawsInventoryEOController extends JeroController<ProjectLaws
public Result<?> compulsoryTransfer(@RequestBody JSONObject json) {
return this.projectLawsInventoryEOService.compulsoryTransfer(json);
}
/**
* 通过projectId查询责任人
*
* @return
*/
@AutoLog(value = "项目库-法规清单表-通过projectId查询责任人")
@ApiOperation(value="项目库-法规清单表-通过projectId查询责任人", notes="项目库-法规清单表-通过projectId查询责任人")
@GetMapping(value = "/queryDutyPersonByProjectId")
public Result<?> queryDutyPersonByProjectId(@RequestParam Map<String,Object> params){
Map<String, List<Map<String, Object>>> res = this.projectLawsInventoryEOService.queryDutyPersonByProjectId(params);
return Result.OK(res);
}
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectCertificationInventoryEOService.java
+1
View File
@@ -253,4 +253,5 @@ public interface IProjectCertificationInventoryEOService extends IService<Projec
void certificationInventoryEOListSortByEndTimeAsc(List<ProjectCertificationInventoryEO> projectCertificationInventoryEOList);
void certificationInventoryEOListSortByInventoryVerifyEndTimeAsc(List<ProjectCertificationInventoryEO> projectCertificationInventoryEOList);
void certificationInventoryEOListSortByTaskConfirmEndTimeAsc(List<ProjectCertificationInventoryEO> projectCertificationInventoryEOList);
Map<String, List<Map<String, Object>>> queryDutyPersonByProjectId(Map<String, Object> params);
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLawsInventoryEOService.java
+2
View File
@@ -255,4 +255,6 @@ public interface IProjectLawsInventoryEOService extends IService<ProjectLawsInve
Result<?> citeDeliverable(JSONObject json);
Result<?> compulsoryTransfer(JSONObject json);
Map<String, List<Map<String, Object>>> queryDutyPersonByProjectId(Map<String, Object> params);
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java
+51
View File
@@ -5277,4 +5277,55 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
return Result.OK("添加配置成功！");
}
@Override
public Map<String, List<Map<String, Object>>> queryDutyPersonByProjectId(Map<String, Object> params) {
Map<String, List<Map<String, Object>>> result = new HashMap<>();
String projectLibraryId = (String) params.get("projectLibraryId");
if(StringUtils.isNotEmpty(projectLibraryId)) {
LambdaQueryWrapper<ProjectCertificationInventoryEO> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(ProjectCertificationInventoryEO::getProjectLibraryId, projectLibraryId);
List<ProjectCertificationInventoryEO> pciList = this.list(queryWrapper);
List<String> dutyList = new ArrayList<>();
List<String> interfaceList = new ArrayList<>();
for (ProjectCertificationInventoryEO pci : pciList) {
if(StringUtils.isNotEmpty(pci.getDutyPerson())){
dutyList.add(pci.getDutyPerson());
}
if(StringUtils.isNotEmpty(pci.getSdt())){
interfaceList.add(pci.getSdt());
}
}
if(CollectionUtils.isNotEmpty(dutyList)){
List<Map<String, Object>> resList = new ArrayList<>();
List<SysUser> userList = this.sysUserService.querySysUserListByIdList(dutyList);
if(CollectionUtils.isNotEmpty(userList)){
for (SysUser user : userList) {
Map<String,Object> userMap = new HashMap<>();
userMap.put("id",user.getId());
userMap.put("userName",user.getUsername());
resList.add(userMap);
}
}
result.put("dutyList",resList);
}
if(CollectionUtils.isNotEmpty(interfaceList)){
List<Map<String, Object>> resList = new ArrayList<>();
List<SysUser> userList = this.sysUserService.querySysUserListByIdList(interfaceList);
if(CollectionUtils.isNotEmpty(userList)){
for (SysUser user : userList) {
Map<String,Object> userMap = new HashMap<>();
userMap.put("id",user.getId());
userMap.put("userName",user.getUsername());
resList.add(userMap);
}
}
result.put("interfaceList",resList);
}
}
return result;
}
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
+256 -84
View File
@@ -45,6 +45,7 @@ import com.jero.modules.feishu.vo.FeishuMsgVo;
import com.jero.modules.message.websocket.WebSocket;
import com.jero.modules.oss.entity.OSSFile;
import com.jero.modules.oss.service.IOSSFileService;
import com.jero.modules.ota.entity.OtaBaCxTxjl;
import com.jero.modules.project.entity.*;
import com.jero.modules.project.enums.*;
import com.jero.modules.project.mapper.*;
@@ -709,6 +710,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
/**
* 编辑法规清单，发送消息
*
* @param projectLawsInventoryEO
*/
private void updateProjectLawsInventorySendMessage(ProjectLawsInventoryEO projectLawsInventoryEO) {
@@ -1123,6 +1125,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
/**
* 更新流程信息
*
* @param projectLawsInventoryEO
*/
public void updateFlowInfo(ProjectLawsInventoryEO projectLawsInventoryEO) {
@@ -1152,6 +1155,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
/**
* 更新流程办理人
*
* @param projectLawsInventoryEO 法规清单数据
* @param projectTaskInventoryEO 任务清单数据
* @param pId 流程实例id
@@ -1209,6 +1213,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
/**
* 更新待办中心流程信息明细表，处理人
*
* @param projectLawsInventoryEO
* @param pId
* @param flowType
@@ -1216,6 +1221,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
public void updateProcessInfoDetailAssignee(ProjectLawsInventoryEO projectLawsInventoryEO, String pId, String flowType) {
this.processInfoDetailEOService.updateProcessInfoDetailUserId(projectLawsInventoryEO, pId, flowType);
}
/**
* 通过id删除
*
@@ -1721,6 +1727,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
return dummyInventoryInfoEOList;
}
}
// 任务确认状态排序
private List<ProjectLawsInventoryEO> taskSort(String orderBy, String orderByField,
List<ProjectLawsInventoryEO> dummyInventoryInfoEOList,
@@ -1757,6 +1764,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
return dummyInventoryInfoEOList;
}
}
//认证级别
private List<ProjectLawsInventoryEO> attestationRankSort(String orderBy, String orderByField,
List<ProjectLawsInventoryEO> dummyInventoryInfoEOList,
@@ -1824,6 +1832,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
});
}
}
//倒序
private void attestationRankReverse(String orderBy, List<ProjectLawsInventoryEO> list, Collator comparator) {
if (OrderEnum.POSITIVE.getValue().equals(orderBy)) {
@@ -1839,6 +1848,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
/**
* 数据字典数据处理方法
*
* @param result 返回值
* @param cut 中英文切换
*/
@@ -1957,6 +1967,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
/**
* 处理展示数据字典值
*
* @param sysDictItems 所有的数据字典项
* @param fieldValues 字段值
* @param cut 中英文切换标识
@@ -2004,6 +2015,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
/**
* 数据处理
*
* @param list
*/
@Override
@@ -2422,6 +2434,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
/**
* 验证数据
*
* @param projectLibraryId 项目id
* @param lawsInventoryId 法规详情id
* @param currentUserId 当前登录人id
@@ -2451,6 +2464,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
/**
* 验证用户在该项目中的角色
*
* @param projectLibraryId 项目库id
* @param currentUserId 登录人id
* @param lawsInventoryId 法规清单id
@@ -2497,6 +2511,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
/**
* 批量更新状态
*
* @param json
* @return
*/
@@ -3004,6 +3019,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
/**
* 发送消息
*
* @param msgContent
* @param userIdList
* @param projectLibraryId
@@ -3068,6 +3084,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
/**
* 匹配相关人员
*
* @param params
* @return
*/
@@ -3388,6 +3405,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
/**
* 获取一个用户的id
*
* @param roleCode
* @param projectRelatedPersonnelList
* @return
@@ -3451,6 +3469,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
/**
* 流程调用
*
* @param jsonObject
* @return
*/
@@ -3596,6 +3615,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
/**
* 工作流发送消息
*
* @param jsonObject
*/
public void workFlowSendMsg(JSONObject jsonObject) {
@@ -4130,8 +4150,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
|| StringUtils.equals(msgType, MsgTypeEnum.TASK_AFFIRM_DRE_REJECTED.getValue())
|| StringUtils.equals(msgType, MsgTypeEnum.TASK_AFFIRM_DRE_ACCEPTED.getValue())
|| StringUtils.equals(msgType, MsgTypeEnum.TASK_AFFIRM_REJECTED_MSG.getValue())
||StringUtils.equals(msgType,MsgTypeEnum.TASK_AFFIRM_ACCEPTED_MSG.getValue()))
{
|| StringUtils.equals(msgType, MsgTypeEnum.TASK_AFFIRM_ACCEPTED_MSG.getValue())) {
hrefFeishu = backUrl
+ JumpLinkEnum.TASK_AFFIRM_LINK.getLink();
//href = "<a href='" + JumpLinkEnum.TASK_AFFIRM_LINK.getLink() + "'>" + " View details" + "</a>";
@@ -4143,8 +4162,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
|| StringUtils.equals(msgType, MsgTypeEnum.VERIFY_CHARGE_PERSON_SUBMIT_MSG.getValue())
|| StringUtils.equals(msgType, MsgTypeEnum.DESIGN_INITIATOR_ACCEPTED_MSG.getValue())
|| StringUtils.equals(msgType, MsgTypeEnum.PREHOMO_INITIATOR_ACCEPTED_MSG.getValue())
||StringUtils.equals(msgType,MsgTypeEnum.VERIFY_INITIATOR_ACCEPTED_MSG.getValue()))
{
|| StringUtils.equals(msgType, MsgTypeEnum.VERIFY_INITIATOR_ACCEPTED_MSG.getValue())) {
hrefFeishu = backUrl
+ JumpLinkEnum.DESIGN_AFFIRM_LINK.getLink()
+ projectLibraryBase.getId()
@@ -4715,9 +4733,11 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
public StringBuilder setUpdateContentLog(StringBuilder contentLogBuilder, String fieldName, String oldValue, String newValue) {
return contentLogBuilder.append("\'" + fieldName + "\'由" + oldValue + "改为了" + newValue).append("</br>");
}
public StringBuilder setUpdateEnContentLog(StringBuilder contentLogBuilder, String fieldName, String oldValue, String newValue) {
return contentLogBuilder.append("\'" + fieldName + "\' changed from " + oldValue + " to " + newValue).append("</br>");
}
private void translateData(List<ProjectLawsInventoryEO> infoList) {
for (ProjectLawsInventoryEO projectLawsInventoryEO : infoList) {
//子标题
@@ -6914,6 +6934,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
/**
* 列表数据验证
*
* @param dataList
* @param dictItemList
* @param zipEntryName
@@ -7269,6 +7290,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
/**
* 模板数据验证
*
* @param dataList
* @param dictItemList
* @param zipEntryName
@@ -8275,101 +8297,179 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
private String fieldConvert(String field) {
if (field == null) return null;
switch (field) {
case "*编号": return "serialNumber";
case "*Number": return "serialNumber";
case "*编号":
return "serialNumber";
case "*Number":
return "serialNumber";
// case "标题": return "title";
case "子标题": return "subtitle";
case "Sub-Title": return "subtitle";
case "适用范围": return "shi4Yong4Fan4Wei2";
case "状态": return "state";
case "子标题":
return "subtitle";
case "Sub-Title":
return "subtitle";
case "适用范围":
return "shi4Yong4Fan4Wei2";
case "状态":
return "state";
// case "对应标准": return "correspondingStandard";
case "实施类别": return "implementType";
case "Usage": return "implementType";
case "新车实施日期": return "xin1Che1Xing2Shi2Shi1Ri4Qi1";
case "实施类别":
return "implementType";
case "Usage":
return "implementType";
case "新车实施日期":
return "xin1Che1Xing2Shi2Shi1Ri4Qi1";
// case "在产车实施日期": return "implementTime";
case "WVTA ID": return "wvtaId";
case "认证类型": return "attestationType";
case "Certification Type": return "attestationType";
case "*认证级别": return "attestationRank";
case "*Certification Level": return "attestationRank";
case "适用增补件": return "applicableSupplement";
case "Applicable Supplement": return "applicableSupplement";
case "技术领域": return "technologyTerritory";
case "*责任领域": return "dutyTerritory";
case "*Responsible Field": return "dutyTerritory";
case "WVTA ID":
return "wvtaId";
case "认证类型":
return "attestationType";
case "Certification Type":
return "attestationType";
case "*认证级别":
return "attestationRank";
case "*Certification Level":
return "attestationRank";
case "适用增补件":
return "applicableSupplement";
case "Applicable Supplement":
return "applicableSupplement";
case "技术领域":
return "technologyTerritory";
case "*责任领域":
return "dutyTerritory";
case "*Responsible Field":
return "dutyTerritory";
// case "适用地区": return "region";
case "备注": return "remark";
case "Comments": return "remark";
case "法规工程师": return "regulationOwnerId";
case "Regulation Engineer": return "regulationOwnerId";
case "认证工程师": return "homologationEngineerId";
case "Homologation Engineer": return "homologationEngineerId";
case "工程接口人": return "engineeringInterfacePerson";
case "Engineering Interface": return "engineeringInterfacePerson";
case "设计交付物类型": return "designDeliverableType";
case "design Deliverable Type": return "designDeliverableType";
case "设计交付物模板": return "designDeliverableTemplate";
case "design Deliverable Template": return "designDeliverableTemplate";
case "设计发起人": return "designInitiatorId";
case "design Reviewer": return "designInitiatorId";
case "设计责任人": return "designDutyId";
case "design Assignee": return "designDutyId";
case "设计截止时间": return "designDueDate";
case "design Due Date": return "designDueDate";
case "备注":
return "remark";
case "Comments":
return "remark";
case "法规工程师":
return "regulationOwnerId";
case "Regulation Engineer":
return "regulationOwnerId";
case "认证工程师":
return "homologationEngineerId";
case "Homologation Engineer":
return "homologationEngineerId";
case "工程接口人":
return "engineeringInterfacePerson";
case "Engineering Interface":
return "engineeringInterfacePerson";
case "设计交付物类型":
return "designDeliverableType";
case "design Deliverable Type":
return "designDeliverableType";
case "设计交付物模板":
return "designDeliverableTemplate";
case "design Deliverable Template":
return "designDeliverableTemplate";
case "设计发起人":
return "designInitiatorId";
case "design Reviewer":
return "designInitiatorId";
case "设计责任人":
return "designDutyId";
case "design Assignee":
return "designDutyId";
case "设计截止时间":
return "designDueDate";
case "design Due Date":
return "designDueDate";
case "设计交付物说明": return "designRemark";
case "design Deliverable Description": return "designRemark";
case "设计交付物说明":
return "designRemark";
case "design Deliverable Description":
return "designRemark";
case "pre交付物类型": return "prehomoDeliverableType";
case "pre Deliverable Type": return "prehomoDeliverableType";
case "pre交付物模板": return "prehomoDeliverableTemplate";
case "pre Deliverable Template": return "prehomoDeliverableTemplate";
case "pre发起人": return "prehomoInitiatorId";
case "pre Reviewer": return "prehomoInitiatorId";
case "pre责任人": return "prehomoDutyId";
case "pre Assignee": return "prehomoDutyId";
case "pre截止时间": return "prehomoDueDate";
case "pre Due Date": return "prehomoDueDate";
case "pre交付物类型":
return "prehomoDeliverableType";
case "pre Deliverable Type":
return "prehomoDeliverableType";
case "pre交付物模板":
return "prehomoDeliverableTemplate";
case "pre Deliverable Template":
return "prehomoDeliverableTemplate";
case "pre发起人":
return "prehomoInitiatorId";
case "pre Reviewer":
return "prehomoInitiatorId";
case "pre责任人":
return "prehomoDutyId";
case "pre Assignee":
return "prehomoDutyId";
case "pre截止时间":
return "prehomoDueDate";
case "pre Due Date":
return "prehomoDueDate";
case "pre交付物说明": return "prehomoRemark";
case "pre Deliverable Description": return "prehomoRemark";
case "pre交付物说明":
return "prehomoRemark";
case "pre Deliverable Description":
return "prehomoRemark";
case "验证交付物类型": return "verifyDeliverableType";
case "verify Deliverable Type": return "verifyDeliverableType";
case "验证交付物模板": return "verifyDeliverableTemplate";
case "verify Deliverable Template": return "verifyDeliverableTemplate";
case "验证发起人": return "verifyInitiatorId";
case "verify Reviewer": return "verifyInitiatorId";
case "验证责任人": return "verifyDutyId";
case "verify Assignee": return "verifyDutyId";
case "验证截止时间": return "verifyDueDate";
case "verify Due Date": return "verifyDueDate";
case "验证交付物类型":
return "verifyDeliverableType";
case "verify Deliverable Type":
return "verifyDeliverableType";
case "验证交付物模板":
return "verifyDeliverableTemplate";
case "verify Deliverable Template":
return "verifyDeliverableTemplate";
case "验证发起人":
return "verifyInitiatorId";
case "verify Reviewer":
return "verifyInitiatorId";
case "验证责任人":
return "verifyDutyId";
case "verify Assignee":
return "verifyDutyId";
case "验证截止时间":
return "verifyDueDate";
case "verify Due Date":
return "verifyDueDate";
case "验证交付物说明": return "verifyRemark";
case "verify Deliverable Description": return "verifyRemark";
case "验证交付物说明":
return "verifyRemark";
case "verify Deliverable Description":
return "verifyRemark";
case "标题": return "title";
case "Title": return "title";
case "标题":
return "title";
case "Title":
return "title";
case "清单确认状态": return "inventoryAffirmStatus";
case "List Confirmation Status": return "inventoryAffirmStatus";
case "清单确认状态":
return "inventoryAffirmStatus";
case "List Confirmation Status":
return "inventoryAffirmStatus";
case "任务确认状态": return "taskAffirmStatus";
case "Task Confirmation Status": return "taskAffirmStatus";
case "任务确认状态":
return "taskAffirmStatus";
case "Task Confirmation Status":
return "taskAffirmStatus";
case "适用地区": return "region";
case "Area": return "region";
case "适用地区":
return "region";
case "Area":
return "region";
case "对应标准": return "correspondingStandard";
case "Compare EU/CN": return "correspondingStandard";
case "对应标准":
return "correspondingStandard";
case "Compare EU/CN":
return "correspondingStandard";
case "新车型实施日期": return "xin1Che1Xing2Shi2Shi1Ri4Qi1";
case "New Type Execution Date": return "xin1Che1Xing2Shi2Shi1Ri4Qi1";
case "新车型实施日期":
return "xin1Che1Xing2Shi2Shi1Ri4Qi1";
case "New Type Execution Date":
return "xin1Che1Xing2Shi2Shi1Ri4Qi1";
case "在产车实施日期": return "implementTime";
case "New Vehicle Execution Date": return "implementTime";
case "在产车实施日期":
return "implementTime";
case "New Vehicle Execution Date":
return "implementTime";
default: return null;
default:
return null;
//"Deliverable Type,Deliverable Template,initiator,Assignee,Due Date," +
}
}
@@ -8420,6 +8520,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
/**
* 获取文件
*
* @param dataList
* @return
*/
@@ -8455,6 +8556,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
}
return fileInfos;
}
@NotNull
private StringBuilder getStringBuilder(ProjectLawsInventoryEO projectLawsInventoryEO, List<SysCategory> sysCategoryList, String technologyTerritory) {
StringBuilder sb = new StringBuilder();
@@ -8474,6 +8576,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
/**
* 数据转换(文件名称,技术领域,对应标准)
*
* @param dataList
* @param fileInfos
*/
@@ -8642,6 +8745,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
/**
* 模板名称转换
*
* @param fileInfos
* @param value
* @return
@@ -8716,6 +8820,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
/**
* 验证用户是否是该项目的studio工程师。
*
* @param projectLibraryId
* @param cut
*/
@@ -9259,6 +9364,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
}
}
}
//表格高度
private static int high = 25;
//表格宽度
@@ -9785,6 +9891,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
/**
* 下载docx报告
*
* @param params
* @param req
* @param resp
@@ -10042,6 +10149,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
/**
* 设置表内容
*
* @param tableIndex 表的下标
* @param wordMLPackage
* @param params
@@ -10164,6 +10272,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
/**
* 催办
*
* @param json
* @return
*/
@@ -10432,6 +10541,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
/**
* 验证符合性 结果待提交状态数据催办
*
* @param projectLibraryId
* @param projectLawsInventoryEOList
*/
@@ -10496,6 +10606,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
/**
* 验证符合性 清单待确认状态数据催办
*
* @param projectLibraryId
* @param projectLawsInventoryEOList
*/
@@ -10560,6 +10671,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
/**
* 验证符合性 结果待审查状态数据催办。
*
* @param projectLibraryId
* @param projectLawsInventoryEOList
*/
@@ -10624,6 +10736,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
/**
* 验证符合性 清单待校核状态数据催办。
*
* @param projectLibraryId
* @param projectLawsInventoryEOList
*/
@@ -10682,6 +10795,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
/**
* 设计符合性 结果待提交状态数据催办
*
* @param projectLibraryId
* @param projectLawsInventoryEOList
*/
@@ -10746,6 +10860,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
/**
* 设计符合性 清单待确认状态数据催办
*
* @param projectLibraryId
* @param projectLawsInventoryEOList
*/
@@ -10810,6 +10925,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
/**
* 设计符合性 结果待审查状态数据催办
*
* @param projectLibraryId
* @param projectLawsInventoryEOList
*/
@@ -10874,6 +10990,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
/**
* 设计符合性 清单待校核状态数据催办
*
* @param projectLibraryId
* @param projectLawsInventoryEOList
*/
@@ -11096,8 +11213,6 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
}
List<SysRole> roleList = sysRoleMapper.getRoleByUserId(loginUser.getId());
//studio角色,法规工程师/认证工程师,领导角色,管理员角色,Viewer
if (roleList.size() != 0) {
@@ -11224,6 +11339,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
/**
* 初始化 法规清单对应的 项目状态评估表
*
* @param projectLawsInventoryId
*/
public void initConditionAssessmentEO(String projectLawsInventoryId) {
@@ -11241,6 +11357,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
/**
* 添加流程信息
*
* @param processInfoEO
* @param projectLibraryId
* @param endTime
@@ -11275,6 +11392,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
/**
* 添加流程信息，用户的待办、已办信息。
*
* @param processInfoId
* @param processInfoDetailEOList
* @param endTime
@@ -11302,6 +11420,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
/**
* 更新流程信息，用户的待办、已办任务信息
*
* @param projeceLawsInventoryId
*/
public void updateProcessInfoDetail(String projeceLawsInventoryId) {
@@ -11339,6 +11458,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
/**
* 任务清单催办
*
* @param projectTaskUrgVo
* @return
*/
@@ -11988,6 +12108,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
/**
* 系统内所有用户验证
*
* @param projectLawsInventoryEO
* @param errorMsg
* @param msgList
@@ -12294,6 +12415,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
/**
* 设计符合性相关待办任务强制转办
*
* @param projectLibraryId
* @param designTransferUserId
* @param pliEoList
@@ -12398,6 +12520,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
/**
* 验证符合性相关待办任务强制转办
*
* @param projectLibraryId
* @param verifyTransferUserId
* @param pliEoList
@@ -12500,4 +12623,53 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
}
}
}
@Override
public Map<String, List<Map<String, Object>>> queryDutyPersonByProjectId(Map<String, Object> params) {
Map<String, List<Map<String, Object>>> result = new HashMap<>();
String projectLibraryId = (String) params.get("projectLibraryId");
if(StringUtils.isNotEmpty(projectLibraryId)){
LambdaQueryWrapper<ProjectLawsInventoryEO> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(ProjectLawsInventoryEO::getProjectLibraryId,projectLibraryId);
List<ProjectLawsInventoryEO> pliList = this.list(queryWrapper);
List<String> designDutyList = new ArrayList<>();
List<String> verifyDutyList = new ArrayList<>();
for (ProjectLawsInventoryEO pli: pliList) {
if(StringUtils.isNotEmpty(pli.getDesignDutyId())){
designDutyList.add(pli.getDesignDutyId());
}
if(StringUtils.isNotEmpty(pli.getVerifyDutyId())){
verifyDutyList.add(pli.getVerifyDutyId());
}
}
if(CollectionUtils.isNotEmpty(designDutyList)){
List<Map<String, Object>> resList = new ArrayList<>();
List<SysUser> userList = this.sysUserService.querySysUserListByIdList(designDutyList);
if(CollectionUtils.isNotEmpty(userList)){
for (SysUser user : userList) {
Map<String,Object> userMap = new HashMap<>();
userMap.put("id",user.getId());
userMap.put("userName",user.getUsername());
resList.add(userMap);
}
}
result.put("designDutyList",resList);
}
if(CollectionUtils.isNotEmpty(verifyDutyList)){
List<Map<String, Object>> resList = new ArrayList<>();
List<SysUser> userList = this.sysUserService.querySysUserListByIdList(verifyDutyList);
if(CollectionUtils.isNotEmpty(userList)){
for (SysUser user : userList) {
Map<String,Object> userMap = new HashMap<>();
userMap.put("id",user.getId());
userMap.put("userName",user.getUsername());
resList.add(userMap);
}
}
result.put("verifyDutyList",resList);
}
}
return result;
}
}