src/main/java/com/unissoft/mapper/ProcessSubMapper.java

@@ -1,7 +1,8 @@
 package com.unissoft.mapper;
 
-import com.unissoft.model.ProcessSub;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.unissoft.model.ProcessSub;
+import org.springframework.stereotype.Repository;
 
 /**
  * <p>
@@ -11,6 +12,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @author My SunShine
  * @since 2021-01-30
  */
+@Repository
 public interface ProcessSubMapper extends BaseMapper<ProcessSub> {
 
 }

src/main/java/com/unissoft/ventilation/controller/ProcessAuditController.java

@@ -12,7 +12,6 @@ import com.unissoft.result.ResultView;
 import com.unissoft.ventilation.service.ProcessAuditService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-
 import org.json.JSONException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -185,7 +184,7 @@ public class ProcessAuditController {
     @ApiOperation(value = "根据待办id，将流程设成已办", notes = "")
     @GetMapping("/haveDone/{id}/{auditState}")
     public ResultView haveDone(@PathVariable Integer id,@PathVariable Integer auditState) {
-    	 processAuditService.haveDone(id,auditState);
+    	 processAuditService.haveDone(id, auditState);
     	 return ResultView.success();
     }
     
@@ -201,6 +200,13 @@ public class ProcessAuditController {
     	 return ResultView.success();
     }
 
+    @ApiOperation(value = "根据待办条件：用户ID、类型、库ID，将流程设成已办", notes = "")
+    @GetMapping("/haveDone2/{userId}/{type}/{depotId}/{auditState}")
+    public ResultView haveDone(@PathVariable Integer userId, @PathVariable String type, @PathVariable Integer depotId,@PathVariable Integer auditState) {
+        processAuditService.haveDone(userId,type,depotId,auditState);
+        return ResultView.success();
+    }
+
 
     @Autowired
     private SystemFeign systemFeign;

src/main/java/com/unissoft/ventilation/service/ProcessAuditService.java

@@ -48,6 +48,8 @@ public interface ProcessAuditService extends IService<ProcessAudit> {
 
 	void haveDone(Integer userId, String type, Integer depotId, Integer houseId,Integer auditState);
 
+	void haveDone(Integer userId, String type, Integer depotId, Integer auditState);
+
 	List<Integer> getNotBeDoneNotice(String toBeDoneIds);
 
 	void yjcgAudit(String parameter);

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

@@ -828,43 +828,26 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
         List<ToBeDoneCallbackVO> result = new ArrayList<>();
 
         String usersInfo = processToBeDone.getUsersInfo();
+        Integer levelDepotHouse = processToBeDone.getLevelDepotHouse();
         if (StringUtils.isNotEmpty(usersInfo)) {
             String[] userInfoArr = usersInfo.split(",");
             for (String userInfo : userInfoArr) {
                 String[] temp = userInfo.split("\\|");
                 Integer userId = Integer.parseInt(temp[0]);
                 SysUserDTO user = systemFeign.getUserById(userId);
-                String storehouseIds = user.getStorehouseIds();
-                String storehouseNames = user.getStorehouseNames();
-                if (StringUtils.isNotEmpty(storehouseIds)) {
-                    String[] houseIdArr = storehouseIds.split(",");
-                    String[] houseNameArr = storehouseNames.split(",");
-                    for (int i = 0; i < houseIdArr.length; i++) {
-                        String houseId = houseIdArr[i];
-                        String houseName = houseNameArr[i];
-                        ProcessToBeDoneVO toBeDoneVO = new ProcessToBeDoneVO();
-                        toBeDoneVO.setTitle(processToBeDone.getTitle());
-                        toBeDoneVO.setHouseId(Integer.parseInt(houseId));
-                        toBeDoneVO.setDepotId(user.getDepotId());
-                        toBeDoneVO.setStartDate(processToBeDone.getStartDate());
-                        toBeDoneVO.setEndDate(processToBeDone.getEndDate());
-                        toBeDoneVO.setToPage(processToBeDone.getToPage());
-                        toBeDoneVO.setUserId(userId);
-                        toBeDoneVO.setType(processToBeDone.getType());
-                        //
-                        ProcessAudit processAudit = toBeDone(toBeDoneVO);//生成待办数据
-                        //
-                        ToBeDoneCallbackVO toBeDoneCallbackVO = new ToBeDoneCallbackVO();
-                        toBeDoneCallbackVO.setToBeDoneId(processAudit.getId());
-                        toBeDoneCallbackVO.setUserId(userId);
-                        toBeDoneCallbackVO.setPersonnelName(user.getPersonnelName());
-                        toBeDoneCallbackVO.setDepotId(user.getDepotId());
-                        toBeDoneCallbackVO.setDepotName(user.getDepotName());
-                        toBeDoneCallbackVO.setHouseId(Integer.parseInt(houseId));
-                        toBeDoneCallbackVO.setHouseName(houseName);
-//                        toBeDoneCallbackVO.setTitle(processToBeDone.getTitle());
-
-                        result.add(toBeDoneCallbackVO);
+                if(1 == levelDepotHouse) {//预警到库级
+                    toBeDoneDetails(result, processToBeDone, user, null, null);
+                } else if(2 == levelDepotHouse) {//预警到仓房级
+                    String storehouseIds = user.getStorehouseIds();
+                    String storehouseNames = user.getStorehouseNames();
+                    if (StringUtils.isNotEmpty(storehouseIds)) {
+                        String[] houseIdArr = storehouseIds.split(",");
+                        String[] houseNameArr = storehouseNames.split(",");
+                        for (int i = 0; i < houseIdArr.length; i++) {
+                            Integer houseId = Integer.parseInt(houseIdArr[i]);
+                            String houseName = houseNameArr[i];
+                            toBeDoneDetails(result, processToBeDone, user, houseId, houseName);
+                        }
                     }
                 }
             }
@@ -873,22 +856,36 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
         return result;
     }
 
-//    private SendNoticeVO getSendNoticeVO(ProcessToBeDoneVO toBeDoneVO, SysUserDTO userDTO, String houseName) {
-//        SendNoticeVO vo = new SendNoticeVO();
-//        Map<Integer, String> users = new HashMap<>();
-//        users.put(userDTO.getUId(), userDTO.getUName());
-//        SysNoticeVO sysNoticeVO = new SysNoticeVO();
-//
-//        String content = toBeDoneVO.getTitle() + "-" + houseName + "-" + "待处理";
-//        sysNoticeVO.setContent(content);
-//        sysNoticeVO.setNoticeTime(new Date());
-//        sysNoticeVO.setNoticeType(10);
-//        sysNoticeVO.setOrgName(userDTO.getCompanyName());
-//
-//        vo.setUsers(users);
-//        vo.setSysNoticeVO(sysNoticeVO);
-//        return vo;
-//    }
+    private void toBeDoneDetails(List<ToBeDoneCallbackVO> result,
+                                 ProcessToBeDone processToBeDone,
+                                 SysUserDTO user,
+                                 Integer houseId,
+                                 String houseName) {
+        ProcessToBeDoneVO toBeDoneVO = new ProcessToBeDoneVO();
+        toBeDoneVO.setTitle(processToBeDone.getTitle());
+        toBeDoneVO.setHouseId(houseId);
+        toBeDoneVO.setDepotId(user.getDepotId());
+        toBeDoneVO.setStartDate(processToBeDone.getStartDate());
+        toBeDoneVO.setEndDate(processToBeDone.getEndDate());
+        toBeDoneVO.setToPage(processToBeDone.getToPage());
+        toBeDoneVO.setUserId(user.getUId());
+        toBeDoneVO.setType(processToBeDone.getType());
+        //
+        ProcessAudit processAudit = toBeDone(toBeDoneVO);//生成待办数据
+        //
+        ToBeDoneCallbackVO toBeDoneCallbackVO = new ToBeDoneCallbackVO();
+        toBeDoneCallbackVO.setToBeDoneId(processAudit.getId());
+        toBeDoneCallbackVO.setUserId(user.getUId());
+        toBeDoneCallbackVO.setPersonnelName(user.getPersonnelName());
+        toBeDoneCallbackVO.setDepotId(user.getDepotId());
+        toBeDoneCallbackVO.setDepotName(user.getDepotName());
+        toBeDoneCallbackVO.setHouseId(houseId);
+        toBeDoneCallbackVO.setHouseName(houseName);
+
+        result.add(toBeDoneCallbackVO);
+    }
+
+
 
     private ProcessAudit toBeDone(ProcessToBeDoneVO processToBeDone) {
         // TODO Auto-generated method stub
@@ -949,7 +946,6 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
 
     }
 
-
     @Override
     public void haveDone(Integer userId, String type, Integer depotId, Integer houseId, Integer auditState) {
         // TODO Auto-generated method stub
@@ -958,8 +954,12 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
         QueryWrapper<ProcessAudit> ew = new QueryWrapper<>();
         ew.eq("to_people", userId);
         ew.eq("type", type);
-        ew.eq("depot_id", depotId);
-        ew.eq("house_id", houseId);
+        if(null != depotId) {
+            ew.eq("depot_id", depotId);
+        }
+        if(null != houseId) {
+            ew.eq("house_id", houseId);
+        }
         ew.orderByDesc("start_date");//根据时间倒叙
         List<ProcessAudit> auditList = processAuditMapper.selectList(ew);
         if (auditList.size() > 0) {
@@ -969,7 +969,11 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
             auditList.get(0).setOperationTime(sf.format(new Date()));//具体办理时的时间
             processAuditMapper.updateById(auditList.get(0));
         }
+    }
 
+    @Override
+    public void haveDone(Integer userId, String type, Integer depotId, Integer auditState) {
+        haveDone(userId, type, depotId, null, auditState);
     }
 
     @Override