审批人管理

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

@@ -1,6 +1,6 @@
 package com.unissoft.mapper;
 
-import com.unissoft.model.ProcessBasis;
+import com.unissoft.model.ProcessBasisSon;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
@@ -9,8 +9,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * </p>
  *
  * @author My SunShine
- * @since 2020-12-09
+ * @since 2020-12-17
  */
-public interface ProcessBasisMapper extends BaseMapper<ProcessBasis> {
+public interface ProcessBasisSonMapper extends BaseMapper<ProcessBasisSon> {
 
 }

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

@@ -1,21 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.unissoft.mapper.ProcessBasisMapper">
+<mapper namespace="com.unissoft.mapper.ProcessBasisSonMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.unissoft.model.ProcessBasis">
+    <resultMap id="BaseResultMap" type="com.unissoft.model.ProcessBasisSon">
         <id column="id" property="id" />
-        <result column="main_id" property="mainId" />
-        <result column="type" property="type" />
-        <result column="title" property="title" />
+        <result column="zid" property="zid" />
         <result column="content" property="content" />
-        <result column="step" property="step" />
-        <result column="create_time" property="createTime" />
+        <result column="depot_id" property="depotId" />
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, main_id, type, title, content, step, create_time
+        id, zid, content, depot_id
     </sql>
 
 </mapper>

src/main/java/com/unissoft/model/ProcessBasis.java

@@ -1,116 +0,0 @@
-package com.unissoft.model;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.IdType;
-import java.util.Date;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableField;
-import java.io.Serializable;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author My SunShine
- * @since 2020-12-09
- */
-@TableName("process_basis")
-@ApiModel(value="ProcessBasis对象", description="")
-public class ProcessBasis implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "流程基础表")
-    @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
-
-    @ApiModelProperty(value = "主流程的id")
-    @TableField("main_id")
-    private Integer mainId;
-
-    @ApiModelProperty(value = "流程的类型")
-    @TableField("type")
-    private String type;
-
-    @ApiModelProperty(value = "每一项流程的名称")
-    @TableField("title")
-    private String title;
-
-    @ApiModelProperty(value = "每一项流程的内容")
-    @TableField("content")
-    private String content;
-
-    @ApiModelProperty(value = "执行顺序")
-    @TableField("step")
-    private String step;
-
-    @ApiModelProperty(value = "创建时间")
-    @TableField("create_time")
-    private Date createTime;
-
-    public Integer getId() {
-        return id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-    public Integer getMainId() {
-        return mainId;
-    }
-
-    public void setMainId(Integer mainId) {
-        this.mainId = mainId;
-    }
-    public String getType() {
-        return type;
-    }
-
-    public void setType(String type) {
-        this.type = type;
-    }
-    public String getTitle() {
-        return title;
-    }
-
-    public void setTitle(String title) {
-        this.title = title;
-    }
-    public String getContent() {
-        return content;
-    }
-
-    public void setContent(String content) {
-        this.content = content;
-    }
-    public String getStep() {
-        return step;
-    }
-
-    public void setStep(String step) {
-        this.step = step;
-    }
-    public Date getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
-
-    @Override
-    public String toString() {
-        return "ProcessBasis{" +
-            "id=" + id +
-            ", mainId=" + mainId +
-            ", type=" + type +
-            ", title=" + title +
-            ", content=" + content +
-            ", step=" + step +
-            ", createTime=" + createTime +
-        "}";
-    }
-}

src/main/java/com/unissoft/model/ProcessBasisSon.java

@@ -0,0 +1,78 @@
+package com.unissoft.model;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author My SunShine
+ * @since 2020-12-17
+ */
+@TableName("process_basis_son")
+@ApiModel(value="ProcessBasisSon对象", description="")
+public class ProcessBasisSon implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    @ApiModelProperty(value = "basis的id")
+    @TableField("zid")
+    private Integer zid;
+
+    @ApiModelProperty(value = "审批人")
+    @TableField("content")
+    private Integer content;
+
+    @ApiModelProperty(value = "库id")
+    @TableField("depot_id")
+    private Integer depotId;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+    public Integer getZid() {
+        return zid;
+    }
+
+    public void setZid(Integer zid) {
+        this.zid = zid;
+    }
+    public Integer getContent() {
+        return content;
+    }
+
+    public void setContent(Integer content) {
+        this.content = content;
+    }
+    public Integer getDepotId() {
+        return depotId;
+    }
+
+    public void setDepotId(Integer depotId) {
+        this.depotId = depotId;
+    }
+
+    @Override
+    public String toString() {
+        return "ProcessBasisSon{" +
+            "id=" + id +
+            ", zid=" + zid +
+            ", content=" + content +
+            ", depotId=" + depotId +
+        "}";
+    }
+}

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

@@ -49,9 +49,9 @@ public class ProcessBasisController {
 	 * @return
 	 */
 	@ApiOperation(value = "根据类型获取审批人信息", notes = "")
-	@GetMapping("/getBasisByType/{type}/{userId}")
-    public ResultView getAllProcess(@PathVariable String type,@PathVariable Integer userId) {
-		List<ProcessBasis> list = processBasisService.getBasisByType(type,userId);
+	@GetMapping("/getBasisByType/{type}/{userId}/{depotId}")
+    public ResultView getAllProcess(@PathVariable String type,@PathVariable Integer userId,@PathVariable Integer depotId) {
+		List<ProcessBasis> list = processBasisService.getBasisByType(type,userId,depotId);
         return ResultView.success(list);
     }
 	

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

@@ -0,0 +1,20 @@
+package com.unissoft.ventilation.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author My SunShine
+ * @since 2020-12-17
+ */
+@RestController
+@RequestMapping("/process-basis-son")
+public class ProcessBasisSonController {
+
+}

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

@@ -20,7 +20,7 @@ public interface ProcessBasisService extends IService<ProcessBasis> {
 
 	//List<ProcessBasis> getBasicProcess(String type,Integer mainId);
 
-	List<ProcessBasis> getBasisByType(String type, Integer userId);
+	List<ProcessBasis> getBasisByType(String type, Integer userId, Integer depotId);
 
 
 }

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

@@ -0,0 +1,16 @@
+package com.unissoft.ventilation.service;
+
+import com.unissoft.model.ProcessBasisSon;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author My SunShine
+ * @since 2020-12-17
+ */
+public interface ProcessBasisSonService extends IService<ProcessBasisSon> {
+
+}

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

@@ -1,5 +1,6 @@
 package com.unissoft.ventilation.service.impl;
 
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
@@ -11,8 +12,10 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.unissoft.mapper.ProcessBasisMapper;
+import com.unissoft.mapper.ProcessBasisSonMapper;
 import com.unissoft.mapper.ProcessMainMapper;
 import com.unissoft.model.ProcessBasis;
+import com.unissoft.model.ProcessBasisSon;
 import com.unissoft.model.ProcessMain;
 import com.unissoft.ventilation.service.ProcessBasisService;
 
@@ -32,36 +35,86 @@ public class ProcessBasisServiceImpl extends ServiceImpl<ProcessBasisMapper, Pro
     private ProcessBasisMapper processBasisMapper;
 	
 	@Autowired
+    private ProcessBasisSonMapper processBasisSonMapper;
+	
+	@Autowired
     private ProcessMainMapper processMainMapper;
 	
 	/**
-	 * 1、根据传过来的数据，获取到type，根据type查询数据，通过title对比，更改content的值
+	 * 1、根据传过来的depotId和类型查询该库有没有设置审批人，如果没有的话则增加，有的话则修改（通过title对比，更改content的值）
 	 * 2、查询主流程表，把有流程的数据id保存到审批人管理里面的main_id字段
 	 */
 	@Override
 	public void add(String parameter) {
+		//解析获取传过来的数据
 		JSONObject jsStr = JSONObject.parseObject(parameter);
+		Integer depotId = jsStr.getInteger("depot_id");
 		String type = jsStr.getString("type");
+		JSONArray jsonArray = jsStr.getJSONArray("data");
+		JSONObject row = null;
+		
 		QueryWrapper<ProcessBasis> ew = new QueryWrapper<>();
         ew.eq("type", type);
 		List<ProcessBasis> pList  = processBasisMapper.selectList(ew);
+		List<Integer> intList = new ArrayList<Integer>();
+		if(pList.size()>0){
+			for (ProcessBasis basis : pList) {
+				intList.add(basis.getId());
+			}
+		}
 		
-		QueryWrapper<ProcessMain> ew1 = new QueryWrapper<>();
-		ew.eq("type", type);
-		ew.eq("exist_process", 0);//存在审批流程的主流程
-		List<ProcessMain> mainList = processMainMapper.selectList(ew1);
 		
-		if(pList.size()>0){
-			JSONArray jsonArray = jsStr.getJSONArray("data");
-			JSONObject row = null;
-			for (int i = 0; i < pList.size(); i++) {//pList的值和jsonArray是一样的（长度一样）
-				for (int j = 0; j < jsonArray.size(); j++) {
-					row = jsonArray.getJSONObject(j); 
-					String title = (String) row.get("title");
+		//根据类型查询主流程中哪个流程下是有审批流程的
+		 QueryWrapper<ProcessMain> ew1 = new QueryWrapper<>();
+		 ew.eq("type", type);
+	     ew.eq("exist_process", 0);//存在审批流程的主流程
+	     List<ProcessMain> mainList = processMainMapper.selectList(ew1);
+			
+			
+		//审批人表数据
+		QueryWrapper<ProcessBasisSon> ew2 = new QueryWrapper<>();
+        ew2.eq("depot_id", depotId);
+        ew2.in("zid", intList);
+        List<ProcessBasisSon> sonList = processBasisSonMapper.selectList(ew2);
+        
+        if(sonList.size()>0){//修改
+        	for (int i = 0; i < sonList.size(); i++) {
+        		if(!sonList.get(i).getContent().equals(0)){//不是保管员 修改设置的值
+        			ProcessBasis processBasis = processBasisMapper.selectById(sonList.get(i).getZid());
+        			for (int j = 0; j < jsonArray.size(); j++) {
+            			row = jsonArray.getJSONObject(j); 
+            			String title = (String) row.get("title");
+    					String content = (String) row.get("content");
+    					if(processBasis.getTitle().equals(title)){
+    						sonList.get(i).setContent(Integer.parseInt(content));
+    						processBasisSonMapper.updateById(sonList.get(i));
+    					}
+            		}
+        			
+				}
+        		
+        	}
+        }else{//新增
+        	ProcessBasisSon processBasisSon = new ProcessBasisSon();
+        	
+        	for (int i = 0; i < pList.size(); i++) {
+        		for (int j = 0; j < jsonArray.size(); j++) {
+        			row = jsonArray.getJSONObject(j); 
+        			String title = (String) row.get("title");
 					String step = (String) row.get("step");
 					String content = (String) row.get("content");
-                    if(title.equals(pList.get(i).getTitle()) && step.equals(pList.get(i).getStep())){
-                    	pList.get(i).setContent(content);
+					if(pList.get(i).getTitle().equals(title)){
+						processBasisSon.setZid(pList.get(i).getId());
+						processBasisSon.setDepotId(depotId);
+						if(content.equals("保管员")){
+							processBasisSon.setContent(0);
+						}else{
+							processBasisSon.setContent(Integer.parseInt(content));
+						}
+						processBasisSonMapper.insert(processBasisSon);
+					}
+					
+					if(title.equals(pList.get(i).getTitle()) && step.equals(pList.get(i).getStep())){
                     	if(type.equals("sswxgz")){//分两个流程 前五行是一个
                     		if(i<5){
                     			pList.get(i).setMainId(mainList.get(0).getId());
@@ -74,10 +127,11 @@ public class ProcessBasisServiceImpl extends ServiceImpl<ProcessBasisMapper, Pro
                     	}
                     	processBasisMapper.updateById(pList.get(i));
 					}
-				}	
-				
+				}
+        		
 			}
-		}
+        }
+		
 	   
 	}
 
@@ -94,7 +148,7 @@ public class ProcessBasisServiceImpl extends ServiceImpl<ProcessBasisMapper, Pro
 
 
 	@Override
-	public List<ProcessBasis> getBasisByType(String type,Integer userId) {
+	public List<ProcessBasis> getBasisByType(String type,Integer userId,Integer depotId) {
 		// TODO Auto-generated method stub
 		
 		QueryWrapper<ProcessBasis> ew = new QueryWrapper<>();
@@ -103,18 +157,20 @@ public class ProcessBasisServiceImpl extends ServiceImpl<ProcessBasisMapper, Pro
 		}
 		List<ProcessBasis> list = processBasisMapper.selectList(ew);
 		
-			if(list.size()>0){
-				if(null != userId ){//content 字段全部是id 传到前端展示
-					for (ProcessBasis processBasis : list) {
-						if(processBasis.getContent().equals("保管员")){
-							processBasis.setContent(userId+"");
-						}
-					}
-					
+		
+		QueryWrapper<ProcessBasisSon> ew1 = new QueryWrapper<>();
+		if(null != depotId){
+			ew1.eq("depot_id", depotId);
+		}
+		List<ProcessBasisSon> sonList = processBasisSonMapper.selectList(ew1);
+		for (ProcessBasis processBasis : list) {
+			for (ProcessBasisSon processBasisSon : sonList) {
+				if(processBasis.getId().equals(processBasisSon.getZid())){
+					processBasis.setContent(processBasisSon.getContent());
+					processBasis.setDepotId(processBasisSon.getDepotId());
 				}
 			}
-				
-		 
+		}
 		return list;
 	}
 

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

@@ -0,0 +1,20 @@
+package com.unissoft.ventilation.service.impl;
+
+import com.unissoft.model.ProcessBasisSon;
+import com.unissoft.mapper.ProcessBasisSonMapper;
+import com.unissoft.ventilation.service.ProcessBasisSonService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author My SunShine
+ * @since 2020-12-17
+ */
+@Service
+public class ProcessBasisSonServiceImpl extends ServiceImpl<ProcessBasisSonMapper, ProcessBasisSon> implements ProcessBasisSonService {
+
+}