修改预警生成待办事项功能

src/main/java/com/unissoft/feign/SystemFeign.java

@@ -7,6 +7,7 @@ import com.unissoft.model.SysUserPO;
 import java.util.Map;
 
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.stereotype.Repository;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -17,6 +18,7 @@ import org.springframework.web.bind.annotation.RequestParam;
  * feign调用system-manage服务
  */
 @FeignClient(value = "csc-szls-system-manage", fallback = SystemHystrix.class)
+@Repository
 public interface SystemFeign {
 
     

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

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

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

@@ -2,6 +2,7 @@ package com.unissoft.mapper;
 
 import com.unissoft.model.ProcessBasis;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.springframework.stereotype.Repository;
 
 /**
  * <p>
@@ -11,6 +12,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @author My SunShine
  * @since 2020-12-17
  */
+@Repository
 public interface ProcessBasisMapper extends BaseMapper<ProcessBasis> {
 
 }

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

@@ -2,6 +2,7 @@ package com.unissoft.mapper;
 
 import com.unissoft.model.ProcessBasisSon;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.springframework.stereotype.Repository;
 
 /**
  * <p>
@@ -11,6 +12,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @author My SunShine
  * @since 2020-12-17
  */
+@Repository
 public interface ProcessBasisSonMapper extends BaseMapper<ProcessBasisSon> {
 
 }

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

@@ -2,6 +2,7 @@ package com.unissoft.mapper;
 
 import com.unissoft.model.ProcessMain;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.springframework.stereotype.Repository;
 
 /**
  * <p>
@@ -11,6 +12,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @author My SunShine
  * @since 2020-12-16
  */
+@Repository
 public interface ProcessMainMapper extends BaseMapper<ProcessMain> {
 
 }

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

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

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

@@ -1,38 +1,21 @@
 package com.unissoft.ventilation.service.impl;
 
 import com.alibaba.fastjson.JSON;
-import com.unissoft.model.BasicsWarehouse;
-import com.unissoft.model.ProcessAudit;
-import com.unissoft.model.ProcessBasis;
-import com.unissoft.model.ProcessBasisSon;
-import com.unissoft.model.ProcessMain;
-import com.unissoft.model.ProcessSub;
-import com.unissoft.model.SysUserPO;
-import com.unissoft.result.PageParam;
-import com.unissoft.MyConstant;
-import com.unissoft.dto.ProcessToBeDone;
-import com.unissoft.mapper.ProcessAuditMapper;
-import com.unissoft.mapper.ProcessBasisMapper;
-import com.unissoft.mapper.ProcessBasisSonMapper;
-import com.unissoft.mapper.ProcessMainMapper;
-import com.unissoft.mapper.ProcessSubMapper;
-import com.unissoft.ventilation.service.ProcessAuditService;
-import com.unissoft.ventilation.service.ProcessBasisService;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.google.common.collect.Maps;
-
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-
+import com.unissoft.MyConstant;
+import com.unissoft.dto.ProcessToBeDone;
+import com.unissoft.feign.SystemFeign;
+import com.unissoft.mapper.*;
+import com.unissoft.model.*;
+import com.unissoft.result.PageParam;
+import com.unissoft.ventilation.service.ProcessAuditService;
+import com.unissoft.ventilation.service.ProcessBasisService;
+import com.unissoft.vo.ProcessToBeDoneVO;
 import org.apache.commons.lang.StringUtils;
 import org.json.JSONException;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -40,6 +23,9 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 import org.springframework.web.client.RestTemplate;
 
+import java.text.SimpleDateFormat;
+import java.util.*;
+
 /**
  * <p>
  * 服务实现类
@@ -72,6 +58,9 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
     @Autowired
     private RestTemplate restTemplate;
 
+    @Autowired
+    private SystemFeign systemFeign;
+
 
     @Override
     public void add(String parameter) {
@@ -610,44 +599,49 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
 
 
     @Override
-    public void toBeDone(ProcessToBeDone processToBeDone) {
-        // TODO Auto-generated method stub
-        ProcessAudit processAudit = new ProcessAudit();
-        if (null != processToBeDone) {
-            processAudit.setResult(1);//是首条记录
-            processAudit.setAuditState(0);//提交待审批
-            // 获得SimpleDateFormat类
-            SimpleDateFormat sf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-            processAudit.setApplyTime(sf.format(new Date()));//申请时间
-
-            if (null != processToBeDone.getHouseId()) {//仓id
-                processAudit.setHouseId(processToBeDone.getHouseId());
-            }
-            if (null != processToBeDone.getDepotId()) {//库id
-                processAudit.setDepotId(processToBeDone.getDepotId());
-            }
-            if (null != processToBeDone.getType()) {//类型(例如:tf)
-                processAudit.setType(processToBeDone.getType());
-            }
-            if (null != processToBeDone.getUserId()) {//待办人员ID
-                processAudit.setToPeople(processToBeDone.getUserId());
-            }
-            if (null != processToBeDone.getTitle()) {//流程名称，如 科长每2周粮情检查
-                processAudit.setWorkName(processToBeDone.getTitle());
-            }
-            if (null != processToBeDone.getStartDate()) {//办理开始时间
-                processAudit.setStartDate(processToBeDone.getStartDate());
-            }
-            if (null != processToBeDone.getEndDate()) {//办理结束时间
-                processAudit.setEndDate(processToBeDone.getEndDate());
-            }
-            if (null != processToBeDone.getToPage()) {//办理页面url
-                processAudit.setToPage(processToBeDone.getToPage());
-            }
-            processAuditMapper.insert(processAudit);
-        }
+    public void toBeDone(ProcessToBeDone processToBeDone) {//systemFeign
+
+
     }
 
+	private void toBeDone(ProcessToBeDoneVO toBeDoneVO) {
+		// TODO Auto-generated method stub
+		ProcessAudit processAudit = new ProcessAudit();
+		if(null != toBeDoneVO){
+			processAudit.setResult(1);//是首条记录
+			processAudit.setAuditState(0);//提交待审批
+			// 获得SimpleDateFormat类
+			SimpleDateFormat sf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+			processAudit.setApplyTime(sf.format(new Date()));//申请时间
+
+			if(null != toBeDoneVO.getHouseId()){//仓id
+				processAudit.setHouseId(toBeDoneVO.getHouseId());
+			}
+			if(null != toBeDoneVO.getDepotId()){//库id
+				processAudit.setDepotId(toBeDoneVO.getDepotId());
+			}
+			if(null != toBeDoneVO.getType()){//类型(例如:tf)
+				processAudit.setType(toBeDoneVO.getType());
+			}
+			if(null != toBeDoneVO.getUserId()){//待办人员ID
+				processAudit.setToPeople(toBeDoneVO.getUserId());
+			}
+			if(null != toBeDoneVO.getTitle()){//流程名称，如 科长每2周粮情检查
+				processAudit.setWorkName(toBeDoneVO.getTitle());
+			}
+			if(null != toBeDoneVO.getStartDate()){//办理开始时间
+				processAudit.setStartDate(toBeDoneVO.getStartDate());
+			}
+			if(null != toBeDoneVO.getEndDate()){//办理结束时间
+				processAudit.setEndDate(toBeDoneVO.getEndDate());
+			}
+			if(null != toBeDoneVO.getToPage()){//办理页面url
+				processAudit.setToPage(toBeDoneVO.getToPage());
+			}
+			processAuditMapper.insert(processAudit);
+		}
+	}
+
 
     @Override
     public void haveDone(Integer id) {