Merge branch 'master' of http://101.36.160.140:21044/csc/csc-szls-business

src/main/java/com/unissoft/mapper/ProcessAuditMapper.xml

@@ -45,15 +45,37 @@
     </select>
 
     <select id="getCurrentMonthData" resultType="com.unissoft.model.ProcessAudit">
-        SELECT
-        <include refid="Base_Column_List"/>
-        FROM
-        process_audit
-        WHERE
-        to_people is not null and
-        audit_state is not null and
-        end_date is not null and
-        DATE_FORMAT(`apply_time`, '%Y%m') = DATE_FORMAT(CURDATE(), '%Y%m')
+      SELECT
+	p.id,
+	p.main_id,
+	p.sub_id,
+	p.sub_data,
+	p.audit_state,
+	p.operation_time,
+	p.type,
+	p.house_id,
+	p.depot_id,
+	p.from_people,
+	p.to_people,
+	p.result,
+	p.apply_people,
+	p.audit_time,
+	p.process_id,
+	p.ongoing_step,
+	p.apply_time,
+	p.work_name,
+	p.start_date,
+	p.end_date,
+	p.to_page
+FROM
+	process_audit p
+LEFT JOIN basics_depot b ON p.depot_id = b.d_id
+WHERE
+	b.p_belonging = 0
+AND p.to_people IS NOT NULL
+AND p.audit_state IS NOT NULL
+AND p.end_date IS NOT NULL
+AND DATE_FORMAT(p.apply_time, '%Y%m') = DATE_FORMAT(CURDATE(), '%Y%m')
     </select>
 
 </mapper>

src/main/java/com/unissoft/ventilation/service/impl/ProcessAuditServiceImpl.java

@@ -205,7 +205,7 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
                 sysNoticeVO.setOrgName(userInfo.getDepotName());//申请人
                 sysNoticeVO.setApplyDept(userInfo.getDepartmentName());//申请部门
                 sysNoticeVO.setCreateBy(applyPeople);
-                sysNoticeVO.setContent(userInfo.getDepotName()+"-"+houseName+"-"+"请审批");
+                sysNoticeVO.setContent(userInfo.getDepotName()+"-"+houseName+"-"+"待审批");
             }
             sendNoticeVO.setSysNoticeVO(sysNoticeVO);
         }
@@ -518,8 +518,8 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
                  /**
                   *  发送通知数据给下一审批人
                   */
-                 sysNoticeVO.setContent(userInfo.getDepotName()+"-"+houseName+"-"+"审批通过");
-                 sysNoticeVO.setNoticeType(30);//申请的时候推送  通知类型：10系统、20待办、30审批通过、40审批不通过、50警告
+                 sysNoticeVO.setContent(userInfo.getDepotName()+"-"+houseName+"-"+"待审批");
+                 sysNoticeVO.setNoticeType(InformModel.TONGGUO.getcode());//申请的时候推送  通知类型：10系统、20待办、30审批通过、40审批不通过、50警告
                 //获取下一审批人的信息
                  ResponseEntity<String> userInfos1 = restTemplate.getForEntity(MyConstant.SYSTEM_USER + toPeople, String.class);
                  if(null != userInfos1 && null != userInfos1.getBody()){
@@ -528,8 +528,8 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
                      users.put(toPeople, userInfo1.getuName());
                  }
              }else{//不通过 发送数据给申请人
-             	sysNoticeVO.setContent(userInfo.getDepotName()+"-"+houseName+"-"+"审批不通过");
-                 sysNoticeVO.setNoticeType(40);//申请的时候推送  通知类型：10系统、20待办、30审批通过、40审批不通过、50警告
+             	 sysNoticeVO.setContent(userInfo.getDepotName()+"-"+houseName+"-"+"审批不通过");
+                 sysNoticeVO.setNoticeType(InformModel.BUTONGGUO.getcode());//申请的时候推送  通知类型：10系统、20待办、30审批通过、40审批不通过、50警告
                  users.put(processAudit.getApplyPeople(), userInfo.getuName());
              }
          } else {
@@ -898,6 +898,15 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
         Page<ProcessAudit> pageInfo = processAuditMapper.selectPage(page, ew);
         if (pageInfo.getTotal() > 0) {
             for (ProcessAudit processAudit : pageInfo.getRecords()) {
+            	//赋值最新的状态
+            	QueryWrapper<ProcessAudit> ew1 = new QueryWrapper<>();
+            	ew1.eq("process_id", processAudit.getProcessId());
+            	ew1.eq("result", 1);//第一条数据
+            	List<ProcessAudit> list = processAuditMapper.selectList(ew1);
+            	if(list.size()>0){
+            		processAudit.setAuditState(list.get(0).getAuditState());
+            	}
+            	
                 //根据仓房id获取仓房名称
             	if(null != processAudit.getHouseId()){
             		ResponseEntity<String> forEntity = restTemplate.getForEntity(MyConstant.SYSTEM_WAREHOUSE + processAudit.getHouseId(), String.class);
@@ -1289,7 +1298,7 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
                  /**
                   *  发送通知数据给下一审批人
                   */
-                 sysNoticeVO.setContent(userInfo.getDepotName()+"-"+houseName+"-"+"审批通过");
+                 sysNoticeVO.setContent(userInfo.getDepotName()+"-"+houseName+"-"+"待审批");
                  sysNoticeVO.setNoticeType(InformModel.TONGGUO.getcode());//申请的时候推送  通知类型：10系统、20待办、30审批通过、40审批不通过、50警告
                 //获取下一审批人的信息
                  ResponseEntity<String> userInfos1 = restTemplate.getForEntity(MyConstant.SYSTEM_USER + toPeople, String.class);
@@ -1513,12 +1522,6 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
                        			}
                        		}else{
                        			item.setAuditState(audit.getAuditState());
-                       			/*if(audit.getAuditState() == null){
-                       				item.setAuditState(0);
-                       			}else{
-                       				
-                       			}*/
-                       			
                        		}
                				
                			}