cpa分发接口调整、质量复核人员数据获取修改

src/main/java/com/jeeplus/modules/centerservice/web/TranspondController.java

@@ -2,6 +2,7 @@ package com.jeeplus.modules.centerservice.web;
 
 import com.alibaba.fastjson.JSON;
 import com.jeeplus.common.web.BaseController;
+import com.jeeplus.modules.act.entity.Act;
 import com.jeeplus.modules.act.service.ActTaskService;
 import com.jeeplus.modules.sys.utils.UserUtils;
 import com.jeeplus.modules.workreimbursement.entity.WorkReimbursement;
@@ -42,37 +43,40 @@ public class TranspondController extends BaseController {
     private WorkReimbursementController workReimbursementController;
 
     /**
-     * 报销审核操作
+     * 审核分发操作
      * @return
      */
-    @RequestMapping(value = "saveAuditFunc", method = RequestMethod.POST)
+    @RequestMapping(value = "auditDistribute", method = RequestMethod.POST)
     @ResponseBody
-    public Map<String,Object> saveAuditFunc(@RequestBody Object object) {
+    public Map<String,Object> auditDistribute(@RequestBody Object object) {
         Map<String,Object> map = new HashMap<>();
+        //判断是否为报销数据参数
         WorkReimbursement workReimbursement = JSON.parseObject(JSON.toJSONString(object), WorkReimbursement.class);
-        HistoricProcessInstance historicProcessInstance = historyService.createHistoricProcessInstanceQuery().processInstanceId(workReimbursement.getProcessInstanceId()).singleResult();
         ProcessInstance processInstance = actTaskService.getProcIns(workReimbursement.getProcessInstanceId());
         if (processInstance!=null) {
             List<Task> taskList = actTaskService.getCurrentTaskList(processInstance);
+            Act act = new Act();
             if(taskList!=null && taskList.size()>1){
                 for (Task taskInfok:taskList) {
                     if (UserUtils.getUser().getId().equals(taskInfok.getAssignee())) {
-                        workReimbursement.getAct().setTaskId(taskInfok.getId());
-                        workReimbursement.getAct().setTaskName(taskInfok.getName());
-                        workReimbursement.getAct().setTaskDefKey(taskInfok.getTaskDefinitionKey());
-                        workReimbursement.getAct().setProcDefId(taskInfok.getProcessDefinitionId());
-                        workReimbursement.getAct().setProcInsId(taskInfok.getProcessInstanceId());
-                        workReimbursement.getAct().setTask(taskInfok);
+                        act.setTaskId(taskInfok.getId());
+                        act.setTaskName(taskInfok.getName());
+                        act.setTaskDefKey(taskInfok.getTaskDefinitionKey());
+                        act.setProcDefId(taskInfok.getProcessDefinitionId());
+                        act.setProcInsId(taskInfok.getProcessInstanceId());
+                        act.setTask(taskInfok);
+                        workReimbursement.setAct(act);
                     }
                 }
             }else {
                 Task task = actTaskService.getCurrentTaskInfo(processInstance);
-                workReimbursement.getAct().setTaskId(task.getId());
-                workReimbursement.getAct().setTaskName(task.getName());
-                workReimbursement.getAct().setTaskDefKey(task.getTaskDefinitionKey());
-                workReimbursement.getAct().setProcDefId(task.getProcessDefinitionId());
-                workReimbursement.getAct().setProcInsId(task.getProcessInstanceId());
-                workReimbursement.getAct().setTask(task);
+                act.setTaskId(task.getId());
+                act.setTaskName(task.getName());
+                act.setTaskDefKey(task.getTaskDefinitionKey());
+                act.setProcDefId(task.getProcessDefinitionId());
+                act.setProcInsId(task.getProcessInstanceId());
+                act.setTask(task);
+                workReimbursement.setAct(act);
             }
         }
         RedirectAttributes redirectAttributes = new RedirectAttributesModelMap();

src/main/java/com/jeeplus/modules/ruralprojectrecords/service/RuralProjectMessageNewService.java

@@ -3045,7 +3045,24 @@ public class RuralProjectMessageNewService extends CrudService<RuralProjectMessa
      * @return
      */
     public List<WorkStaffCertificate> getCertificateByUser(String userId){
+        List<String> certificateTypeList = Lists.newArrayList();
         List<WorkStaffCertificate> list=projectcontentinfoDao.getCertificateByUser(userId);
+        if(list.size()>0){
+            for (WorkStaffCertificate info: list) {
+                certificateTypeList.add(info.getName());
+            }
+            String join = String.join(",", certificateTypeList);
+            if(join.contains("161,171")){
+                //排除 重新申请|撤销
+                Iterator<WorkStaffCertificate> it = list.iterator();
+                while(it.hasNext()){
+                    WorkStaffCertificate w = it.next();
+                    if(!"161".equals(w.getName())){
+                        it.remove();
+                    }
+                }
+            }
+        }
         return list;
     }
 

src/main/java/com/jeeplus/modules/ruralprojectrecords/service/RuralProjectMessageService.java

@@ -3590,7 +3590,24 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
      * @return
      */
     public List<WorkStaffCertificate> getCertificateByUser(String userId){
+        List<String> certificateTypeList = Lists.newArrayList();
         List<WorkStaffCertificate> list=projectcontentinfoDao.getCertificateByUser(userId);
+        if(list.size()>0){
+            for (WorkStaffCertificate info: list) {
+                certificateTypeList.add(info.getName());
+            }
+            String join = String.join(",", certificateTypeList);
+            if(join.contains("161,171")){
+                //排除 重新申请|撤销
+                Iterator<WorkStaffCertificate> it = list.iterator();
+                while(it.hasNext()){
+                    WorkStaffCertificate w = it.next();
+                    if(!"161".equals(w.getName())){
+                        it.remove();
+                    }
+                }
+            }
+        }
         return list;
     }
 

src/main/java/com/jeeplus/modules/workfullmanage/web/WorkFullManageController.java

@@ -1118,7 +1118,7 @@ public class WorkFullManageController extends BaseController {
 			consultant.setAuditOpinion(auditOpinion);
 			if(consultant.getZixunyuan().equals(currentConsultant.getZixunyuan())){
 				try {
-					MyBeanUtils.copyBeanNotNull2Bean(consultant, currentConsultant);
+					MyBeanUtils.copyBeanNotNull2Bean( currentConsultant,consultant);
 				} catch (Exception e) {
 					e.printStackTrace();
 				}