，

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

@@ -1,16 +0,0 @@
-package com.unissoft.mapper;
-
-import com.unissoft.model.ProcessAudit;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author My SunShine
- * @since 2020-12-19
- */
-public interface ProcessAuditMapper extends BaseMapper<ProcessAudit> {
-
-}

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

@@ -1,31 +0,0 @@
-<?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.ProcessAuditMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.unissoft.model.ProcessAudit">
-        <id column="id" property="id" />
-        <result column="main_id" property="mainId" />
-        <result column="sub_id" property="subId" />
-        <result column="sub_data" property="subData" />
-        <result column="audit_state" property="auditState" />
-        <result column="operation_time" property="operationTime" />
-        <result column="type" property="type" />
-        <result column="house_id" property="houseId" />
-        <result column="depot_id" property="depotId" />
-        <result column="from_people" property="fromPeople" />
-        <result column="to_people" property="toPeople" />
-        <result column="result" property="result" />
-        <result column="apply_people" property="applyPeople" />
-        <result column="audit_time" property="auditTime" />
-        <result column="process_id" property="processId" />
-        <result column="ongoing_step" property="ongoingStep" />
-        <result column="apply_time" property="applyTime" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, main_id, sub_id, sub_data, audit_state, operation_time, type, house_id, depot_id, from_people, to_people, result, apply_people, audit_time, process_id, ongoing_step, apply_time
-    </sql>
-
-</mapper>

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

@@ -1,284 +0,0 @@
-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-19
- */
-@TableName("process_audit")
-@ApiModel(value="ProcessAudit对象", description="")
-public class ProcessAudit implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    
-
-    //业务字段
-    @TableField(exist = false)
-    private String houseName;
-    @TableField(exist = false)
-	private String applyName;
-    @TableField(exist = false)
-	private String departmentName;
-    @TableField(exist = false)
-	private String companyName;
-	
-	
-	
-	
-
-    public String getHouseName() {
-		return houseName;
-	}
-
-	public void setHouseName(String houseName) {
-		this.houseName = houseName;
-	}
-
-	public String getApplyName() {
-		return applyName;
-	}
-
-	public void setApplyName(String applyName) {
-		this.applyName = applyName;
-	}
-
-	public String getDepartmentName() {
-		return departmentName;
-	}
-
-	public void setDepartmentName(String departmentName) {
-		this.departmentName = departmentName;
-	}
-
-	public String getCompanyName() {
-		return companyName;
-	}
-
-	public void setCompanyName(String companyName) {
-		this.companyName = companyName;
-	}
-	
-	
-    @ApiModelProperty(value = "流程审批表")
-    @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
-
-    @ApiModelProperty(value = "主流程id")
-    @TableField("main_id")
-    private Integer mainId;
-
-    @ApiModelProperty(value = "子流程的id")
-    @TableField("sub_id")
-    private Integer subId;
-
-    @ApiModelProperty(value = "子流程的数据(1:是，0:否)")
-    @TableField("sub_data")
-    private Integer subData;
-
-    @ApiModelProperty(value = "审批状态(0:提交,1审批通过:,2:审批不通过，3:审批完成进行中，4已完成）")
-    @TableField("audit_state")
-    private Integer auditState;
-
-    @ApiModelProperty(value = "子流程的操作时间")
-    @TableField("operation_time")
-    private String operationTime;
-
-    @ApiModelProperty(value = "流程类型(如:tf）")
-    @TableField("type")
-    private String type;
-
-    @ApiModelProperty(value = "仓房id")
-    @TableField("house_id")
-    private Integer houseId;
-
-    @ApiModelProperty(value = "库id")
-    @TableField("depot_id")
-    private Integer depotId;
-
-    @ApiModelProperty(value = "提交人")
-    @TableField("from_people")
-    private Integer fromPeople;
-
-    @ApiModelProperty(value = "审批人")
-    @TableField("to_people")
-    private Integer toPeople;
-
-    @ApiModelProperty(value = "是否是整个业务的首条记录（1是0否）")
-    @TableField("result")
-    private Integer result;
-
-    @ApiModelProperty(value = "申请人")
-    @TableField("apply_people")
-    private Integer applyPeople;
-
-    @ApiModelProperty(value = "审批时间")
-    @TableField("audit_time")
-    private String auditTime;
-
-    @ApiModelProperty(value = "每一个业务流程的流程标识")
-    @TableField("process_id")
-    private String processId;
-
-    @ApiModelProperty(value = "进行到哪一步的主流程id")
-    @TableField("ongoing_step")
-    private String ongoingStep;
-
-    @ApiModelProperty(value = "申请时间")
-    @TableField("apply_time")
-    private String applyTime;
-
-    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 Integer getSubId() {
-        return subId;
-    }
-
-    public void setSubId(Integer subId) {
-        this.subId = subId;
-    }
-    public Integer getSubData() {
-        return subData;
-    }
-
-    public void setSubData(Integer subData) {
-        this.subData = subData;
-    }
-    public Integer getAuditState() {
-        return auditState;
-    }
-
-    public void setAuditState(Integer auditState) {
-        this.auditState = auditState;
-    }
-    public String getOperationTime() {
-        return operationTime;
-    }
-
-    public void setOperationTime(String operationTime) {
-        this.operationTime = operationTime;
-    }
-    public String getType() {
-        return type;
-    }
-
-    public void setType(String type) {
-        this.type = type;
-    }
-    public Integer getHouseId() {
-        return houseId;
-    }
-
-    public void setHouseId(Integer houseId) {
-        this.houseId = houseId;
-    }
-    public Integer getDepotId() {
-        return depotId;
-    }
-
-    public void setDepotId(Integer depotId) {
-        this.depotId = depotId;
-    }
-    public Integer getFromPeople() {
-        return fromPeople;
-    }
-
-    public void setFromPeople(Integer fromPeople) {
-        this.fromPeople = fromPeople;
-    }
-    public Integer getToPeople() {
-        return toPeople;
-    }
-
-    public void setToPeople(Integer toPeople) {
-        this.toPeople = toPeople;
-    }
-    public Integer getResult() {
-        return result;
-    }
-
-    public void setResult(Integer result) {
-        this.result = result;
-    }
-    public Integer getApplyPeople() {
-        return applyPeople;
-    }
-
-    public void setApplyPeople(Integer applyPeople) {
-        this.applyPeople = applyPeople;
-    }
-    public String getAuditTime() {
-        return auditTime;
-    }
-
-    public void setAuditTime(String auditTime) {
-        this.auditTime = auditTime;
-    }
-    public String getProcessId() {
-        return processId;
-    }
-
-    public void setProcessId(String processId) {
-        this.processId = processId;
-    }
-    public String getOngoingStep() {
-        return ongoingStep;
-    }
-
-    public void setOngoingStep(String ongoingStep) {
-        this.ongoingStep = ongoingStep;
-    }
-    public String getApplyTime() {
-        return applyTime;
-    }
-
-    public void setApplyTime(String applyTime) {
-        this.applyTime = applyTime;
-    }
-
-    @Override
-    public String toString() {
-        return "ProcessAudit{" +
-            "id=" + id +
-            ", mainId=" + mainId +
-            ", subId=" + subId +
-            ", subData=" + subData +
-            ", auditState=" + auditState +
-            ", operationTime=" + operationTime +
-            ", type=" + type +
-            ", houseId=" + houseId +
-            ", depotId=" + depotId +
-            ", fromPeople=" + fromPeople +
-            ", toPeople=" + toPeople +
-            ", result=" + result +
-            ", applyPeople=" + applyPeople +
-            ", auditTime=" + auditTime +
-            ", processId=" + processId +
-            ", ongoingStep=" + ongoingStep +
-            ", applyTime=" + applyTime +
-        "}";
-    }
-}

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

@@ -2,6 +2,7 @@ package com.unissoft.ventilation.controller;
 
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.unissoft.dto.ProcessToBeDone;
 import com.unissoft.model.ProcessAudit;
 import com.unissoft.result.PageParam;
 import com.unissoft.result.ResultView;
@@ -147,4 +148,38 @@ public class ProcessAuditController {
         return ResultView.success(page);
     }
     
+    /**
+     * 粮情生成待办事项
+     */
+    @ApiOperation(value = "粮情生成待办事项", notes = "")
+    @PostMapping("/toBeDone")
+    public void toBeDone(@RequestBody ProcessToBeDone processToBeDone) {
+		processAuditService.toBeDone(processToBeDone);
+    }
+    
+    
+    /**
+     * 根据待办id，将流程设成已办
+       同时要存储具体办理时的时间，因为要计算该流程办理的周期(或计算逾期时间)
+     * @param id
+     */
+    @ApiOperation(value = "根据待办id，将流程设成已办", notes = "")
+    @GetMapping("/haveDone/{id}")
+    public void haveDone(@PathVariable Integer id) {
+    	 processAuditService.haveDone(id);
+    }
+    
+    
+    /**
+     * 根据用户id、流程类型(如科长每2周粮情检查的类型：xxxx1)，按时间倒序查出待办流程，将最近日期的流程设成已办
+       同时要存储具体办理时的时间，因为要计算该流程办理的周期(或计算逾期时间)
+     * @param id
+     */
+    @ApiOperation(value = "根据待办id，将流程设成已办", notes = "")
+    @GetMapping("/haveDone/{userId}/{type}/{depotId}/{houseId}")
+    public void haveDone(@PathVariable Integer userId, @PathVariable String type, @PathVariable Integer depotId, @PathVariable Integer houseId) {
+    	 processAuditService.haveDone(userId,type,depotId,houseId);
+    }
+    
+	
 }

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

@@ -1,5 +1,6 @@
 package com.unissoft.ventilation.service;
 
+import com.unissoft.dto.ProcessToBeDone;
 import com.unissoft.model.ProcessAudit;
 import com.unissoft.result.PageParam;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -42,4 +43,10 @@ public interface ProcessAuditService extends IService<ProcessAudit> {
 
 	Page<ProcessAudit> completeList(PageParam pageParam) throws JSONException;
 
+	void toBeDone(ProcessToBeDone processToBeDone);
+
+	void haveDone(Integer id);
+
+	void haveDone(Integer userId, String type, Integer depotId, Integer houseId);
+
 }

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

@@ -10,6 +10,7 @@ import com.unissoft.model.SysUserPO;
 import com.unissoft.result.PageParam;
 import com.unissoft.utils.UserUtils;
 import com.unissoft.MyConstant;
+import com.unissoft.dto.ProcessToBeDone;
 import com.unissoft.feign.SystemFeign;
 import com.unissoft.mapper.ProcessAuditMapper;
 import com.unissoft.mapper.ProcessBasisMapper;
@@ -25,8 +26,9 @@ 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;
@@ -124,6 +126,10 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
 			processAudit.setApplyTime(applyTime);
 			processAudit.setAuditState(0);//已提交
 			processAudit.setOngoingStep(ongoingStep);
+			if(type.equals("tf")){
+				processAudit.setWorkName("机械通风申请");
+			}
+			
 			if(i==0){
 				processAudit.setResult(1);//第一条数据 保存并审批  1是0否
 				processAudit.setProcessId(UUID.randomUUID().toString());//唯一的流程标识
@@ -587,4 +593,77 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
 		return pageInfo;
 	}
 
+
+	@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);
+		}
+	}
+
+
+	@Override
+	public void haveDone(Integer id) {
+		// TODO Auto-generated method stub
+		ProcessAudit processAudit = processAuditMapper.selectById(id);
+		processAudit.setAuditState(1);
+		 // 获得SimpleDateFormat类
+        SimpleDateFormat sf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+		processAudit.setOperationTime(sf.format(new Date()));//具体办理时的时间
+		processAuditMapper.updateById(processAudit);
+	}
+
+
+	@Override
+	public void haveDone(Integer userId, String type, Integer depotId, Integer houseId) {
+		// TODO Auto-generated method stub
+		//根据用户id、流程类型(如科长每2周粮情检查的类型：xxxx1)，按时间倒序查出待办流程，将最近日期的流程设成已办
+		//同时要存储具体办理时的时间，因为要计算该流程办理的周期(或计算逾期时间)
+		QueryWrapper<ProcessAudit> ew = new QueryWrapper<>();
+		ew.eq("to_people",userId);
+		ew.eq("type",type);
+		ew.eq("depot_id",depotId);
+		ew.eq("house_id",houseId);
+		ew.orderByDesc("start_date");//根据时间倒叙
+		List<ProcessAudit> auditList  = processAuditMapper.selectList(ew);
+		auditList.get(0).setAuditState(1);//设置为已办
+		 // 获得SimpleDateFormat类
+        SimpleDateFormat sf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        auditList.get(0).setOperationTime(sf.format(new Date()));//具体办理时的时间
+        processAuditMapper.updateById(auditList.get(0));
+		
+	}
+
 }