Merge remote-tracking branch 'origin/master'

src/main/java/com/unissoft/Swagger2Config.java

@@ -19,7 +19,7 @@ import java.util.Collections;
 import java.util.List;
 
 /**
- * Swagger2配置类
+ *  Swagger2配置类
  */
 @Configuration
 @EnableSwagger2

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

@@ -1,12 +1,9 @@
 package com.unissoft.feign;
 
 import com.unissoft.MyConstant;
-import com.unissoft.result.ResultView;
+import com.unissoft.model.BasicsWarehouse;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 
 
@@ -20,7 +17,7 @@ public interface SystemFeign {
     //@PostMapping("/oauth/token")
    // Map<String, Object> token(@RequestParam("username") String username, @RequestParam("password") String password, @RequestParam("client_id") String client_id, @RequestParam("client_secret") String client_secret, @RequestParam("grant_type") String grant_type, @RequestParam("scope") String scope);
 
-	@GetMapping(value = "/basicsWarehouse/authority/getById")
-	ResultView getById(@RequestParam("id") int id);
+	@GetMapping(value = "/basicsWarehouse/authority/getByIdHouse")
+	BasicsWarehouse getById(@RequestParam("id") Integer id);
 
 }

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

@@ -1,6 +1,6 @@
 package com.unissoft.feign;
 
-import com.unissoft.result.ResultView;
+import com.unissoft.model.BasicsWarehouse;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
@@ -15,7 +15,7 @@ public class SystemHystrix implements SystemFeign {
     private final Logger logger = LoggerFactory.getLogger(SystemHystrix.class);
 
 	@Override
-	public ResultView getById(int id) {
+	public BasicsWarehouse getById(Integer id) {
 		// TODO Auto-generated method stub
 		System.err.println("调用csc-szls-system-manage服务getById方法失败!");
         logger.error("调用csc-szls-system-manage服务getById方法失败!");

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

@@ -1,122 +1,122 @@
-package com.unissoft.ventilation.controller;
-
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-import com.github.pagehelper.PageInfo;
-import com.google.common.collect.Maps;
-import com.unissoft.model.ProcessAudit;
-import com.unissoft.result.PageParam;
-import com.unissoft.result.ResultView;
-import com.unissoft.ventilation.service.ProcessAuditService;
-
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author My SunShine
- * @since 2020-12-08
- */
-@Api(description = "审批流程详情控制器")
-@RestController
-@RequestMapping("/ventilation/processAudit")
-public class ProcessAuditController {
-
-	@Autowired
-    private ProcessAuditService processAuditService;
-	
-	/**
-	 * 新增一个审批流程数据第一次 新增提交
-	 * @param parameter
-	 * @return
-	 */
-	@ApiOperation(value = "新增", notes = "")
-    @PostMapping("/add")
-    public ResultView add(@RequestBody String parameter) {
-		processAuditService.add(parameter);
-        return ResultView.success();
-    }
-	
-	
-	/**
-	 * 机械通风列表
-	 */
-    @ApiOperation(value = "分页条件查询", notes = "提交参数：{\"pageIndex\":1,\"pageSize\":10,  \"condition\":\"{\'startTime\':\'\',\'endTime\':\'\'}\"}")
-    @PostMapping("/getPage")
-    public ResultView getPage(@RequestBody PageParam pageParam) throws Exception{
-        PageInfo<ProcessAudit> page = processAuditService.getPage(pageParam);
-        return ResultView.success(page);
-    }
-    
-    /**
-     * 通过审批第一条数据的id查询所有数据
-     * @param id
-     * @return
-     */
-    @ApiOperation(value = "根据id和审批状态查询", notes = "")
-    @GetMapping("/getById/{id}")
-    public ResultView getById(@PathVariable Integer id) {
-    	List<Map<String,Object>> list = processAuditService.getAllById(id);
-        return ResultView.success(list);
-    }
-    
-    
-    /**
-     * 删除
-     * @param id
-     * @return
-     */
-    @ApiOperation(value = "根据id删除数据", notes = "")
-    @GetMapping("/deleteById/{id}")
-    public ResultView deleteById(@PathVariable Integer id) {
-    	 processAuditService.deleteById(id);
-        return ResultView.success();
-    }
-    
-    
-    /**
-     * 待审批列表(待处理列表)
-     * @throws Exception 
-     */
-    @ApiOperation(value = "分页条件查询", notes = "提交参数：{\"pageIndex\":1,\"pageSize\":10,\"condition\":\"{\'startTime\':\'\',\'endTime\':\'\',\'userId\':\'\'}\"}")
-    @PostMapping("/toDisposeList")
-    public ResultView toDisposeList(@RequestBody PageParam pageParam) throws Exception {
-        PageInfo<ProcessAudit> page = processAuditService.toDisposeList(pageParam);
-        return ResultView.success(page);
-    }
-    
-    /**
-     * 审批
-     */
-    @ApiOperation(value = "审批", notes = "")
-    @PostMapping("/audit")
-    public ResultView audit(@RequestBody String parameter) {
-		processAuditService.audit(parameter);
-        return ResultView.success();
-    }
-    
-    /**
-     * 通风记录详情的增加(审批之后的操作)
-     */
-    @ApiOperation(value = "通风记录详情的增加", notes = "")
-    @PostMapping("/detailsAdd")
-    public ResultView detailsAdd(@RequestBody String parameter) {
-		processAuditService.detailsAdd(parameter);
-        return ResultView.success();
-    }
-}
+package com.unissoft.ventilation.controller;
+
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+import com.github.pagehelper.PageInfo;
+import com.google.common.collect.Maps;
+import com.unissoft.model.ProcessAudit;
+import com.unissoft.result.PageParam;
+import com.unissoft.result.ResultView;
+import com.unissoft.ventilation.service.ProcessAuditService;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author My SunShine
+ * @since 2020-12-08
+ */
+@Api(description = "审批流程详情控制器")
+@RestController
+@RequestMapping("/ventilation/processAudit")
+public class ProcessAuditController {
+
+	@Autowired
+    private ProcessAuditService processAuditService;
+	
+	/**
+	 * 新增一个审批流程数据第一次 新增提交
+	 * @param parameter
+	 * @return
+	 */
+	@ApiOperation(value = "新增", notes = "")
+    @PostMapping("/add")
+    public ResultView add(@RequestBody String parameter) {
+		processAuditService.add(parameter);
+        return ResultView.success();
+    }
+	
+	
+	/**
+	 * 机械通风列表
+	 */
+    @ApiOperation(value = "分页条件查询", notes = "提交参数：{\"pageIndex\":1,\"pageSize\":10,  \"condition\":\"{\'startTime\':\'\',\'endTime\':\'\'}\"}")
+    @PostMapping("/getPage")
+    public ResultView getPage(@RequestBody PageParam pageParam) throws Exception{
+        PageInfo<ProcessAudit> page = processAuditService.getPage(pageParam);
+        return ResultView.success(page);
+    }
+    
+    /**
+     * 通过审批第一条数据的id查询所有数据
+     * @param id
+     * @return
+     */
+    @ApiOperation(value = "根据id和审批状态查询", notes = "")
+    @GetMapping("/getById/{id}")
+    public ResultView getById(@PathVariable Integer id) {
+    	List<Map<String,Object>> list = processAuditService.getAllById(id);
+        return ResultView.success(list);
+    }
+    
+    
+    /**
+     * 删除
+     * @param id
+     * @return
+     */
+    @ApiOperation(value = "根据id删除数据", notes = "")
+    @GetMapping("/deleteById/{id}")
+    public ResultView deleteById(@PathVariable Integer id) {
+    	 processAuditService.deleteById(id);
+        return ResultView.success();
+    }
+    
+    
+    /**
+     * 待审批列表(待处理列表)
+     * @throws Exception 
+     */
+    @ApiOperation(value = "分页条件查询,userId必填", notes = "提交参数：{\"pageIndex\":1,\"pageSize\":10,\"condition\":\"{\'startTime\':\'\',\'endTime\':\'\',\'userId\':\'\'}\"}")
+    @PostMapping("/toDisposeList")
+    public ResultView toDisposeList(@RequestBody PageParam pageParam) throws Exception {
+        PageInfo<ProcessAudit> page = processAuditService.toDisposeList(pageParam);
+        return ResultView.success(page);
+    }
+    
+    /**
+     * 审批
+     */
+    @ApiOperation(value = "审批", notes = "")
+    @PostMapping("/audit")
+    public ResultView audit(@RequestBody String parameter) {
+		processAuditService.audit(parameter);
+        return ResultView.success();
+    }
+    
+    /**
+     * 通风记录详情的增加(审批之后的操作)
+     */
+    @ApiOperation(value = "通风记录详情的增加", notes = "")
+    @PostMapping("/detailsAdd")
+    public ResultView detailsAdd(@RequestBody String parameter) {
+		processAuditService.detailsAdd(parameter);
+        return ResultView.success();
+    }
+}

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

@@ -2,12 +2,10 @@ package com.unissoft.ventilation.service.impl;
 
 import com.unissoft.model.BasicsWarehouse;
 import com.unissoft.model.ProcessAudit;
-import com.unissoft.model.ProcessBasis;
 import com.unissoft.model.ProcessMain;
 import com.unissoft.model.ProcessSub;
 import com.unissoft.model.SysUserPO;
 import com.unissoft.result.PageParam;
-import com.unissoft.result.ResultView;
 import com.unissoft.utils.UserUtils;
 import com.unissoft.MyConstant;
 import com.unissoft.feign.SystemFeign;
@@ -15,6 +13,7 @@ import com.unissoft.mapper.ProcessAuditMapper;
 import com.unissoft.mapper.ProcessMainMapper;
 import com.unissoft.mapper.ProcessSubMapper;
 import com.unissoft.ventilation.service.ProcessAuditService;
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -22,9 +21,7 @@ import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 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;
@@ -65,31 +62,42 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
 		JSONObject jsStr = JSONObject.parseObject(parameter);
 		String type = jsStr.getString("type");//流程类型
 		Integer mainId = jsStr.getInteger("main_id");//主流程id
-		Integer subId = jsStr.getInteger("sub_id");//子流程id
-		Integer subData = jsStr.getInteger("sub_data");//子流程数据
-		String operationTime = jsStr.getString("operation_time");//子流程的操作时间
 		Integer houseId = jsStr.getInteger("house_id");//仓房id
 		Integer depotId = jsStr.getInteger("depot_id");//库id
 		Integer applyPeople = jsStr.getInteger("apply_people");//申请人id
 		Integer fromPeople = jsStr.getInteger("from_people");//提交人id
-		Integer toPeople = jsStr.getInteger("to_people");//申请人id
-		 
+		Integer toPeople = jsStr.getInteger("to_people");//审批人id
+
+		JSONArray jsonArray = jsStr.getJSONArray("subList");//子流程数据
+		JSONObject row = null;
+		for (int i = 0; i < jsonArray.size(); i++) {
+			row = jsonArray.getJSONObject(i); 
+			Integer subId = (Integer) row.get("id");//子流程id
+			Integer subData = (Integer) row.get("sub_data");//子流程数据
+			String operationTime = (String) row.get("operation_time");//子流程的操作时间
+			
+			ProcessAudit processAudit = new ProcessAudit();
+			processAudit.setType(type);
+			processAudit.setMainId(mainId);
+			processAudit.setSubId(subId);
+			processAudit.setSubData(subData);
+			processAudit.setOperationTime(operationTime);
+			processAudit.setHouseId(houseId);
+			processAudit.setDepotId(depotId);
+			processAudit.setApplyPeople(applyPeople);
+			processAudit.setFromPeople(fromPeople);
+			processAudit.setToPeople(toPeople);
+			processAudit.setAuditState(0);//已提交
+			if(i==0){
+				processAudit.setResult(1);//第一条数据 保存并审批  1是0否
+				processAudit.setProcessId(UUID.randomUUID().toString());//唯一的流程标识
+			}else{
+				processAudit.setResult(0);// 保存并审批  1是0否
+				processAudit.setProcessId((String)jsonArray.getJSONObject(0).get("process_id")); //多条数据时，流程标识取第一条的
+			}
+			processAuditMapper.insert(processAudit);
+		}
 		
-		ProcessAudit processAudit = new ProcessAudit();
-		processAudit.setType(type);
-		processAudit.setMainId(mainId);
-		processAudit.setSubId(subId);
-		processAudit.setSubData(subData);
-		processAudit.setOperationTime(operationTime);
-		processAudit.setHouseId(houseId);
-		processAudit.setDepotId(depotId);
-		processAudit.setFromPeople(fromPeople);
-		processAudit.setApplyPeople(applyPeople);
-		processAudit.setToPeople(toPeople);
-		processAudit.setResult(1);//第一条数据 保存并审批
-		processAudit.setAuditState(0);//已提交状态
-		processAudit.setProcessId(UUID.randomUUID().toString());//唯一的流程标识
-		processAuditMapper.insert(processAudit);
 		
 	}
 	
@@ -188,20 +196,26 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
         ew.eq("audit_state", 0);//已提交
         List<ProcessAudit> list = processAuditMapper.selectList(ew);
         
-        for (ProcessAudit processAudit : list) {
-        	//根据仓房id获取仓房名称
-        	ResultView resultView = systemFeign.getById(processAudit.getHouseId());
-        	BasicsWarehouse ware = (BasicsWarehouse) resultView.getData();
-        	//全局获取当前登录人的信息
-        	SysUserPO currUserInfo = UserUtils.getCurrUserInfo();
-        	//赋值
-        	processAudit.setApplyName(currUserInfo.getuName());
-        	processAudit.setCompanyName(currUserInfo.getCompanyName());
-        	processAudit.setDepartmentName(currUserInfo.getDepartmentName());
-        	if(null != ware){
-        		processAudit.setHouseName(ware.gethName());
-        	}
-		}
+        if(list.size()>0){
+        	for (ProcessAudit processAudit : list) {
+            	//根据仓房id获取仓房名称
+            	BasicsWarehouse ware = systemFeign.getById(processAudit.getHouseId());
+            	if(null != ware){
+            		processAudit.setHouseName(ware.gethName());
+            	}
+            	//BasicsWarehouse ware = (BasicsWarehouse) resultView.getData();
+            	//全局获取当前登录人的信息
+            	SysUserPO currUserInfo = UserUtils.getCurrUserInfo();
+            	//赋值
+            	if(null != currUserInfo){
+            		processAudit.setApplyName(currUserInfo.getuName());
+                	processAudit.setCompanyName(currUserInfo.getCompanyName());
+                	processAudit.setDepartmentName(currUserInfo.getDepartmentName());
+            	}
+            	
+    		}
+        }
+        
         if (pageIndex != MyConstant.ZERO && pageSize != MyConstant.ZERO) {
             PageHelper.startPage(pageIndex, pageSize);
         }
@@ -262,30 +276,50 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
 	public void detailsAdd(String parameter) {
 		// TODO Auto-generated method stub
 		JSONObject jsStr = JSONObject.parseObject(parameter);
+		String processId = jsStr.getString("process_id");//流程id 每一条明细都是和第一条保存提交的流程id一样
 		String type = jsStr.getString("type");//流程类型
 		Integer mainId = jsStr.getInteger("main_id");//主流程id
-		Integer subId = jsStr.getInteger("sub_id");//子流程id
-		Integer subData = jsStr.getInteger("sub_data");//子流程数据
-		String operationTime = jsStr.getString("operation_time");//子流程的操作时间
 		Integer houseId = jsStr.getInteger("house_id");//仓房id
 		Integer depotId = jsStr.getInteger("depot_id");//库id
 		Integer applyPeople = jsStr.getInteger("apply_people");//申请人id
 		Integer auditState = jsStr.getInteger("audit_state");//审批状态
-		
-		 
-		
-		ProcessAudit processAudit = new ProcessAudit();
-		processAudit.setType(type);
-		processAudit.setMainId(mainId);
-		processAudit.setSubId(subId);
-		processAudit.setSubData(subData);
-		processAudit.setOperationTime(operationTime);
-		processAudit.setHouseId(houseId);
-		processAudit.setDepotId(depotId);
-		processAudit.setApplyPeople(applyPeople);
-		processAudit.setResult(0);//第一条数据 保存并审批  1是0否
-		processAudit.setAuditState(auditState);
-		processAuditMapper.insert(processAudit);
+		JSONArray jsonArray = jsStr.getJSONArray("subList");//子流程数据
+		JSONObject row = null;
+		for (int i = 0; i < jsonArray.size(); i++) {
+			row = jsonArray.getJSONObject(i);
+			Integer subId = (Integer) row.get("sub_id");//子流程id
+			Integer subData = (Integer) row.get("sub_data");//子流程数据
+			String operationTime = (String) row.get("operation_time");//子流程的操作时间
+			if(null != row.get("id")){
+				//修改
+				Integer id = (Integer) row.get("id");//子流程id
+				  //根据id去查询该条数据
+				ProcessAudit processAudit = processAuditMapper.selectById(id);
+				if(processAudit.getSubData().equals(subData) && processAudit.getOperationTime().equals(operationTime)){
+					//不做操作
+				}else{
+					processAudit.setSubData(subData);
+					processAudit.setOperationTime(operationTime);
+					processAuditMapper.updateById(processAudit);
+				}
+			}else{
+				//新增
+				ProcessAudit processAudit = new ProcessAudit();
+				processAudit.setType(type);
+				processAudit.setMainId(mainId);
+				processAudit.setSubId(subId);
+				processAudit.setSubData(subData);
+				processAudit.setOperationTime(operationTime);
+				processAudit.setHouseId(houseId);
+				processAudit.setDepotId(depotId);
+				processAudit.setApplyPeople(applyPeople);
+				processAudit.setResult(0);//第一条数据 保存并审批  1是0否
+				processAudit.setProcessId(processId);
+				processAudit.setAuditState(auditState);
+				processAuditMapper.insert(processAudit);
+			}
+			
+		}
 	}
 
 }