增加流程

pro-base/src/main/java/com/idea/oa/apply/mapper/ApplyPaymentSettleMapper.java

@@ -0,0 +1,30 @@
+package com.idea.oa.apply.mapper;
+
+import com.idea.oa.apply.model.ApplyPaymentSettle;
+import com.idea.oa.apply.model.ApplyPaymentSettleExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface ApplyPaymentSettleMapper {
+    long countByExample(ApplyPaymentSettleExample example);
+
+    int deleteByExample(ApplyPaymentSettleExample example);
+
+    int deleteByPrimaryKey(String id);
+
+    int insert(ApplyPaymentSettle record);
+
+    int insertSelective(ApplyPaymentSettle record);
+
+    List<ApplyPaymentSettle> selectByExample(ApplyPaymentSettleExample example);
+
+    ApplyPaymentSettle selectByPrimaryKey(String id);
+
+    int updateByExampleSelective(@Param("record") ApplyPaymentSettle record, @Param("example") ApplyPaymentSettleExample example);
+
+    int updateByExample(@Param("record") ApplyPaymentSettle record, @Param("example") ApplyPaymentSettleExample example);
+
+    int updateByPrimaryKeySelective(ApplyPaymentSettle record);
+
+    int updateByPrimaryKey(ApplyPaymentSettle record);
+}

pro-base/src/main/java/com/idea/oa/apply/model/ApplyOffWork.java

@@ -1,124 +0,0 @@
-package com.idea.oa.apply.model;
-
-import java.io.Serializable;
-import java.util.Date;
-
-public class ApplyOffWork implements Serializable {
-    @Override
-    public String toString() {
-        return "ApplyOffWork{" +
-                "id='" + id + '\'' +
-                ", applyReasons='" + applyReasons + '\'' +
-                ", totalApplyTime='" + totalApplyTime + '\'' +
-                ", fileDataIds='" + fileDataIds + '\'' +
-                ", status=" + status +
-                ", createdBy='" + createdBy + '\'' +
-                ", createdAt=" + createdAt +
-                ", updatedBy='" + updatedBy + '\'' +
-                ", updatedAt=" + updatedAt +
-                ", remark='" + remark + '\'' +
-                '}';
-    }
-
-    private String id;
-
-    private String applyReasons;
-
-    private String totalApplyTime;
-
-    private String fileDataIds;
-
-    private Integer status;
-
-    private String createdBy;
-
-    private Date createdAt;
-
-    private String updatedBy;
-
-    private Date updatedAt;
-
-    private String remark;
-
-    private static final long serialVersionUID = 1L;
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id == null ? null : id.trim();
-    }
-
-    public String getApplyReasons() {
-        return applyReasons;
-    }
-
-    public void setApplyReasons(String applyReasons) {
-        this.applyReasons = applyReasons == null ? null : applyReasons.trim();
-    }
-
-    public String getTotalApplyTime() {
-        return totalApplyTime;
-    }
-
-    public void setTotalApplyTime(String totalApplyTime) {
-        this.totalApplyTime = totalApplyTime == null ? null : totalApplyTime.trim();
-    }
-
-    public String getFileDataIds() {
-        return fileDataIds;
-    }
-
-    public void setFileDataIds(String fileDataIds) {
-        this.fileDataIds = fileDataIds == null ? null : fileDataIds.trim();
-    }
-
-    public Integer getStatus() {
-        return status;
-    }
-
-    public void setStatus(Integer status) {
-        this.status = status;
-    }
-
-    public String getCreatedBy() {
-        return createdBy;
-    }
-
-    public void setCreatedBy(String createdBy) {
-        this.createdBy = createdBy == null ? null : createdBy.trim();
-    }
-
-    public Date getCreatedAt() {
-        return createdAt;
-    }
-
-    public void setCreatedAt(Date createdAt) {
-        this.createdAt = createdAt;
-    }
-
-    public String getUpdatedBy() {
-        return updatedBy;
-    }
-
-    public void setUpdatedBy(String updatedBy) {
-        this.updatedBy = updatedBy == null ? null : updatedBy.trim();
-    }
-
-    public Date getUpdatedAt() {
-        return updatedAt;
-    }
-
-    public void setUpdatedAt(Date updatedAt) {
-        this.updatedAt = updatedAt;
-    }
-
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark == null ? null : remark.trim();
-    }
-}

pro-base/src/main/java/com/idea/oa/apply/model/ApplyOffWorkExample.java

@@ -1,871 +0,0 @@
-package com.idea.oa.apply.model;
-
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-public class ApplyOffWorkExample {
-    protected String orderByClause;
-
-    protected boolean distinct;
-
-    protected List<Criteria> oredCriteria;
-
-    public ApplyOffWorkExample() {
-        oredCriteria = new ArrayList<Criteria>();
-    }
-
-    public void setOrderByClause(String orderByClause) {
-        this.orderByClause = orderByClause;
-    }
-
-    public String getOrderByClause() {
-        return orderByClause;
-    }
-
-    public void setDistinct(boolean distinct) {
-        this.distinct = distinct;
-    }
-
-    public boolean isDistinct() {
-        return distinct;
-    }
-
-    public List<Criteria> getOredCriteria() {
-        return oredCriteria;
-    }
-
-    public void or(Criteria criteria) {
-        oredCriteria.add(criteria);
-    }
-
-    public Criteria or() {
-        Criteria criteria = createCriteriaInternal();
-        oredCriteria.add(criteria);
-        return criteria;
-    }
-
-    public Criteria createCriteria() {
-        Criteria criteria = createCriteriaInternal();
-        if (oredCriteria.size() == 0) {
-            oredCriteria.add(criteria);
-        }
-        return criteria;
-    }
-
-    protected Criteria createCriteriaInternal() {
-        Criteria criteria = new Criteria();
-        return criteria;
-    }
-
-    public void clear() {
-        oredCriteria.clear();
-        orderByClause = null;
-        distinct = false;
-    }
-
-    protected abstract static class GeneratedCriteria {
-        protected List<Criterion> criteria;
-
-        protected GeneratedCriteria() {
-            super();
-            criteria = new ArrayList<Criterion>();
-        }
-
-        public boolean isValid() {
-            return criteria.size() > 0;
-        }
-
-        public List<Criterion> getAllCriteria() {
-            return criteria;
-        }
-
-        public List<Criterion> getCriteria() {
-            return criteria;
-        }
-
-        protected void addCriterion(String condition) {
-            if (condition == null) {
-                throw new RuntimeException("Value for condition cannot be null");
-            }
-            criteria.add(new Criterion(condition));
-        }
-
-        protected void addCriterion(String condition, Object value, String property) {
-            if (value == null) {
-                throw new RuntimeException("Value for " + property + " cannot be null");
-            }
-            criteria.add(new Criterion(condition, value));
-        }
-
-        protected void addCriterion(String condition, Object value1, Object value2, String property) {
-            if (value1 == null || value2 == null) {
-                throw new RuntimeException("Between values for " + property + " cannot be null");
-            }
-            criteria.add(new Criterion(condition, value1, value2));
-        }
-
-        public Criteria andIdIsNull() {
-            addCriterion("id is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andIdIsNotNull() {
-            addCriterion("id is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andIdEqualTo(String value) {
-            addCriterion("id =", value, "id");
-            return (Criteria) this;
-        }
-
-        public Criteria andIdNotEqualTo(String value) {
-            addCriterion("id <>", value, "id");
-            return (Criteria) this;
-        }
-
-        public Criteria andIdGreaterThan(String value) {
-            addCriterion("id >", value, "id");
-            return (Criteria) this;
-        }
-
-        public Criteria andIdGreaterThanOrEqualTo(String value) {
-            addCriterion("id >=", value, "id");
-            return (Criteria) this;
-        }
-
-        public Criteria andIdLessThan(String value) {
-            addCriterion("id <", value, "id");
-            return (Criteria) this;
-        }
-
-        public Criteria andIdLessThanOrEqualTo(String value) {
-            addCriterion("id <=", value, "id");
-            return (Criteria) this;
-        }
-
-        public Criteria andIdLike(String value) {
-            addCriterion("id like", value, "id");
-            return (Criteria) this;
-        }
-
-        public Criteria andIdNotLike(String value) {
-            addCriterion("id not like", value, "id");
-            return (Criteria) this;
-        }
-
-        public Criteria andIdIn(List<String> values) {
-            addCriterion("id in", values, "id");
-            return (Criteria) this;
-        }
-
-        public Criteria andIdNotIn(List<String> values) {
-            addCriterion("id not in", values, "id");
-            return (Criteria) this;
-        }
-
-        public Criteria andIdBetween(String value1, String value2) {
-            addCriterion("id between", value1, value2, "id");
-            return (Criteria) this;
-        }
-
-        public Criteria andIdNotBetween(String value1, String value2) {
-            addCriterion("id not between", value1, value2, "id");
-            return (Criteria) this;
-        }
-
-        public Criteria andApplyReasonsIsNull() {
-            addCriterion("apply_reasons is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andApplyReasonsIsNotNull() {
-            addCriterion("apply_reasons is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andApplyReasonsEqualTo(String value) {
-            addCriterion("apply_reasons =", value, "applyReasons");
-            return (Criteria) this;
-        }
-
-        public Criteria andApplyReasonsNotEqualTo(String value) {
-            addCriterion("apply_reasons <>", value, "applyReasons");
-            return (Criteria) this;
-        }
-
-        public Criteria andApplyReasonsGreaterThan(String value) {
-            addCriterion("apply_reasons >", value, "applyReasons");
-            return (Criteria) this;
-        }
-
-        public Criteria andApplyReasonsGreaterThanOrEqualTo(String value) {
-            addCriterion("apply_reasons >=", value, "applyReasons");
-            return (Criteria) this;
-        }
-
-        public Criteria andApplyReasonsLessThan(String value) {
-            addCriterion("apply_reasons <", value, "applyReasons");
-            return (Criteria) this;
-        }
-
-        public Criteria andApplyReasonsLessThanOrEqualTo(String value) {
-            addCriterion("apply_reasons <=", value, "applyReasons");
-            return (Criteria) this;
-        }
-
-        public Criteria andApplyReasonsLike(String value) {
-            addCriterion("apply_reasons like", value, "applyReasons");
-            return (Criteria) this;
-        }
-
-        public Criteria andApplyReasonsNotLike(String value) {
-            addCriterion("apply_reasons not like", value, "applyReasons");
-            return (Criteria) this;
-        }
-
-        public Criteria andApplyReasonsIn(List<String> values) {
-            addCriterion("apply_reasons in", values, "applyReasons");
-            return (Criteria) this;
-        }
-
-        public Criteria andApplyReasonsNotIn(List<String> values) {
-            addCriterion("apply_reasons not in", values, "applyReasons");
-            return (Criteria) this;
-        }
-
-        public Criteria andApplyReasonsBetween(String value1, String value2) {
-            addCriterion("apply_reasons between", value1, value2, "applyReasons");
-            return (Criteria) this;
-        }
-
-        public Criteria andApplyReasonsNotBetween(String value1, String value2) {
-            addCriterion("apply_reasons not between", value1, value2, "applyReasons");
-            return (Criteria) this;
-        }
-
-        public Criteria andTotalApplyTimeIsNull() {
-            addCriterion("total_apply_time is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andTotalApplyTimeIsNotNull() {
-            addCriterion("total_apply_time is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andTotalApplyTimeEqualTo(String value) {
-            addCriterion("total_apply_time =", value, "totalApplyTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andTotalApplyTimeNotEqualTo(String value) {
-            addCriterion("total_apply_time <>", value, "totalApplyTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andTotalApplyTimeGreaterThan(String value) {
-            addCriterion("total_apply_time >", value, "totalApplyTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andTotalApplyTimeGreaterThanOrEqualTo(String value) {
-            addCriterion("total_apply_time >=", value, "totalApplyTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andTotalApplyTimeLessThan(String value) {
-            addCriterion("total_apply_time <", value, "totalApplyTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andTotalApplyTimeLessThanOrEqualTo(String value) {
-            addCriterion("total_apply_time <=", value, "totalApplyTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andTotalApplyTimeLike(String value) {
-            addCriterion("total_apply_time like", value, "totalApplyTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andTotalApplyTimeNotLike(String value) {
-            addCriterion("total_apply_time not like", value, "totalApplyTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andTotalApplyTimeIn(List<String> values) {
-            addCriterion("total_apply_time in", values, "totalApplyTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andTotalApplyTimeNotIn(List<String> values) {
-            addCriterion("total_apply_time not in", values, "totalApplyTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andTotalApplyTimeBetween(String value1, String value2) {
-            addCriterion("total_apply_time between", value1, value2, "totalApplyTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andTotalApplyTimeNotBetween(String value1, String value2) {
-            addCriterion("total_apply_time not between", value1, value2, "totalApplyTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andFileDataIdsIsNull() {
-            addCriterion("file_data_ids is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andFileDataIdsIsNotNull() {
-            addCriterion("file_data_ids is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andFileDataIdsEqualTo(String value) {
-            addCriterion("file_data_ids =", value, "fileDataIds");
-            return (Criteria) this;
-        }
-
-        public Criteria andFileDataIdsNotEqualTo(String value) {
-            addCriterion("file_data_ids <>", value, "fileDataIds");
-            return (Criteria) this;
-        }
-
-        public Criteria andFileDataIdsGreaterThan(String value) {
-            addCriterion("file_data_ids >", value, "fileDataIds");
-            return (Criteria) this;
-        }
-
-        public Criteria andFileDataIdsGreaterThanOrEqualTo(String value) {
-            addCriterion("file_data_ids >=", value, "fileDataIds");
-            return (Criteria) this;
-        }
-
-        public Criteria andFileDataIdsLessThan(String value) {
-            addCriterion("file_data_ids <", value, "fileDataIds");
-            return (Criteria) this;
-        }
-
-        public Criteria andFileDataIdsLessThanOrEqualTo(String value) {
-            addCriterion("file_data_ids <=", value, "fileDataIds");
-            return (Criteria) this;
-        }
-
-        public Criteria andFileDataIdsLike(String value) {
-            addCriterion("file_data_ids like", value, "fileDataIds");
-            return (Criteria) this;
-        }
-
-        public Criteria andFileDataIdsNotLike(String value) {
-            addCriterion("file_data_ids not like", value, "fileDataIds");
-            return (Criteria) this;
-        }
-
-        public Criteria andFileDataIdsIn(List<String> values) {
-            addCriterion("file_data_ids in", values, "fileDataIds");
-            return (Criteria) this;
-        }
-
-        public Criteria andFileDataIdsNotIn(List<String> values) {
-            addCriterion("file_data_ids not in", values, "fileDataIds");
-            return (Criteria) this;
-        }
-
-        public Criteria andFileDataIdsBetween(String value1, String value2) {
-            addCriterion("file_data_ids between", value1, value2, "fileDataIds");
-            return (Criteria) this;
-        }
-
-        public Criteria andFileDataIdsNotBetween(String value1, String value2) {
-            addCriterion("file_data_ids not between", value1, value2, "fileDataIds");
-            return (Criteria) this;
-        }
-
-        public Criteria andStatusIsNull() {
-            addCriterion("status is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andStatusIsNotNull() {
-            addCriterion("status is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andStatusEqualTo(Integer value) {
-            addCriterion("status =", value, "status");
-            return (Criteria) this;
-        }
-
-        public Criteria andStatusNotEqualTo(Integer value) {
-            addCriterion("status <>", value, "status");
-            return (Criteria) this;
-        }
-
-        public Criteria andStatusGreaterThan(Integer value) {
-            addCriterion("status >", value, "status");
-            return (Criteria) this;
-        }
-
-        public Criteria andStatusGreaterThanOrEqualTo(Integer value) {
-            addCriterion("status >=", value, "status");
-            return (Criteria) this;
-        }
-
-        public Criteria andStatusLessThan(Integer value) {
-            addCriterion("status <", value, "status");
-            return (Criteria) this;
-        }
-
-        public Criteria andStatusLessThanOrEqualTo(Integer value) {
-            addCriterion("status <=", value, "status");
-            return (Criteria) this;
-        }
-
-        public Criteria andStatusIn(List<Integer> values) {
-            addCriterion("status in", values, "status");
-            return (Criteria) this;
-        }
-
-        public Criteria andStatusNotIn(List<Integer> values) {
-            addCriterion("status not in", values, "status");
-            return (Criteria) this;
-        }
-
-        public Criteria andStatusBetween(Integer value1, Integer value2) {
-            addCriterion("status between", value1, value2, "status");
-            return (Criteria) this;
-        }
-
-        public Criteria andStatusNotBetween(Integer value1, Integer value2) {
-            addCriterion("status not between", value1, value2, "status");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreatedByIsNull() {
-            addCriterion("created_by is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreatedByIsNotNull() {
-            addCriterion("created_by is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreatedByEqualTo(String value) {
-            addCriterion("created_by =", value, "createdBy");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreatedByNotEqualTo(String value) {
-            addCriterion("created_by <>", value, "createdBy");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreatedByGreaterThan(String value) {
-            addCriterion("created_by >", value, "createdBy");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreatedByGreaterThanOrEqualTo(String value) {
-            addCriterion("created_by >=", value, "createdBy");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreatedByLessThan(String value) {
-            addCriterion("created_by <", value, "createdBy");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreatedByLessThanOrEqualTo(String value) {
-            addCriterion("created_by <=", value, "createdBy");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreatedByLike(String value) {
-            addCriterion("created_by like", value, "createdBy");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreatedByNotLike(String value) {
-            addCriterion("created_by not like", value, "createdBy");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreatedByIn(List<String> values) {
-            addCriterion("created_by in", values, "createdBy");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreatedByNotIn(List<String> values) {
-            addCriterion("created_by not in", values, "createdBy");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreatedByBetween(String value1, String value2) {
-            addCriterion("created_by between", value1, value2, "createdBy");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreatedByNotBetween(String value1, String value2) {
-            addCriterion("created_by not between", value1, value2, "createdBy");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreatedAtIsNull() {
-            addCriterion("created_at is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreatedAtIsNotNull() {
-            addCriterion("created_at is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreatedAtEqualTo(Date value) {
-            addCriterion("created_at =", value, "createdAt");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreatedAtNotEqualTo(Date value) {
-            addCriterion("created_at <>", value, "createdAt");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreatedAtGreaterThan(Date value) {
-            addCriterion("created_at >", value, "createdAt");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreatedAtGreaterThanOrEqualTo(Date value) {
-            addCriterion("created_at >=", value, "createdAt");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreatedAtLessThan(Date value) {
-            addCriterion("created_at <", value, "createdAt");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreatedAtLessThanOrEqualTo(Date value) {
-            addCriterion("created_at <=", value, "createdAt");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreatedAtIn(List<Date> values) {
-            addCriterion("created_at in", values, "createdAt");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreatedAtNotIn(List<Date> values) {
-            addCriterion("created_at not in", values, "createdAt");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreatedAtBetween(Date value1, Date value2) {
-            addCriterion("created_at between", value1, value2, "createdAt");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreatedAtNotBetween(Date value1, Date value2) {
-            addCriterion("created_at not between", value1, value2, "createdAt");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdatedByIsNull() {
-            addCriterion("updated_by is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdatedByIsNotNull() {
-            addCriterion("updated_by is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdatedByEqualTo(String value) {
-            addCriterion("updated_by =", value, "updatedBy");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdatedByNotEqualTo(String value) {
-            addCriterion("updated_by <>", value, "updatedBy");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdatedByGreaterThan(String value) {
-            addCriterion("updated_by >", value, "updatedBy");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdatedByGreaterThanOrEqualTo(String value) {
-            addCriterion("updated_by >=", value, "updatedBy");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdatedByLessThan(String value) {
-            addCriterion("updated_by <", value, "updatedBy");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdatedByLessThanOrEqualTo(String value) {
-            addCriterion("updated_by <=", value, "updatedBy");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdatedByLike(String value) {
-            addCriterion("updated_by like", value, "updatedBy");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdatedByNotLike(String value) {
-            addCriterion("updated_by not like", value, "updatedBy");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdatedByIn(List<String> values) {
-            addCriterion("updated_by in", values, "updatedBy");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdatedByNotIn(List<String> values) {
-            addCriterion("updated_by not in", values, "updatedBy");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdatedByBetween(String value1, String value2) {
-            addCriterion("updated_by between", value1, value2, "updatedBy");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdatedByNotBetween(String value1, String value2) {
-            addCriterion("updated_by not between", value1, value2, "updatedBy");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdatedAtIsNull() {
-            addCriterion("updated_at is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdatedAtIsNotNull() {
-            addCriterion("updated_at is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdatedAtEqualTo(Date value) {
-            addCriterion("updated_at =", value, "updatedAt");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdatedAtNotEqualTo(Date value) {
-            addCriterion("updated_at <>", value, "updatedAt");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdatedAtGreaterThan(Date value) {
-            addCriterion("updated_at >", value, "updatedAt");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdatedAtGreaterThanOrEqualTo(Date value) {
-            addCriterion("updated_at >=", value, "updatedAt");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdatedAtLessThan(Date value) {
-            addCriterion("updated_at <", value, "updatedAt");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdatedAtLessThanOrEqualTo(Date value) {
-            addCriterion("updated_at <=", value, "updatedAt");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdatedAtIn(List<Date> values) {
-            addCriterion("updated_at in", values, "updatedAt");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdatedAtNotIn(List<Date> values) {
-            addCriterion("updated_at not in", values, "updatedAt");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdatedAtBetween(Date value1, Date value2) {
-            addCriterion("updated_at between", value1, value2, "updatedAt");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdatedAtNotBetween(Date value1, Date value2) {
-            addCriterion("updated_at not between", value1, value2, "updatedAt");
-            return (Criteria) this;
-        }
-
-        public Criteria andRemarkIsNull() {
-            addCriterion("remark is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andRemarkIsNotNull() {
-            addCriterion("remark is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andRemarkEqualTo(String value) {
-            addCriterion("remark =", value, "remark");
-            return (Criteria) this;
-        }
-
-        public Criteria andRemarkNotEqualTo(String value) {
-            addCriterion("remark <>", value, "remark");
-            return (Criteria) this;
-        }
-
-        public Criteria andRemarkGreaterThan(String value) {
-            addCriterion("remark >", value, "remark");
-            return (Criteria) this;
-        }
-
-        public Criteria andRemarkGreaterThanOrEqualTo(String value) {
-            addCriterion("remark >=", value, "remark");
-            return (Criteria) this;
-        }
-
-        public Criteria andRemarkLessThan(String value) {
-            addCriterion("remark <", value, "remark");
-            return (Criteria) this;
-        }
-
-        public Criteria andRemarkLessThanOrEqualTo(String value) {
-            addCriterion("remark <=", value, "remark");
-            return (Criteria) this;
-        }
-
-        public Criteria andRemarkLike(String value) {
-            addCriterion("remark like", value, "remark");
-            return (Criteria) this;
-        }
-
-        public Criteria andRemarkNotLike(String value) {
-            addCriterion("remark not like", value, "remark");
-            return (Criteria) this;
-        }
-
-        public Criteria andRemarkIn(List<String> values) {
-            addCriterion("remark in", values, "remark");
-            return (Criteria) this;
-        }
-
-        public Criteria andRemarkNotIn(List<String> values) {
-            addCriterion("remark not in", values, "remark");
-            return (Criteria) this;
-        }
-
-        public Criteria andRemarkBetween(String value1, String value2) {
-            addCriterion("remark between", value1, value2, "remark");
-            return (Criteria) this;
-        }
-
-        public Criteria andRemarkNotBetween(String value1, String value2) {
-            addCriterion("remark not between", value1, value2, "remark");
-            return (Criteria) this;
-        }
-    }
-
-    public static class Criteria extends GeneratedCriteria {
-
-        protected Criteria() {
-            super();
-        }
-    }
-
-    public static class Criterion {
-        private String condition;
-
-        private Object value;
-
-        private Object secondValue;
-
-        private boolean noValue;
-
-        private boolean singleValue;
-
-        private boolean betweenValue;
-
-        private boolean listValue;
-
-        private String typeHandler;
-
-        public String getCondition() {
-            return condition;
-        }
-
-        public Object getValue() {
-            return value;
-        }
-
-        public Object getSecondValue() {
-            return secondValue;
-        }
-
-        public boolean isNoValue() {
-            return noValue;
-        }
-
-        public boolean isSingleValue() {
-            return singleValue;
-        }
-
-        public boolean isBetweenValue() {
-            return betweenValue;
-        }
-
-        public boolean isListValue() {
-            return listValue;
-        }
-
-        public String getTypeHandler() {
-            return typeHandler;
-        }
-
-        protected Criterion(String condition) {
-            super();
-            this.condition = condition;
-            this.typeHandler = null;
-            this.noValue = true;
-        }
-
-        protected Criterion(String condition, Object value, String typeHandler) {
-            super();
-            this.condition = condition;
-            this.value = value;
-            this.typeHandler = typeHandler;
-            if (value instanceof List<?>) {
-                this.listValue = true;
-            } else {
-                this.singleValue = true;
-            }
-        }
-
-        protected Criterion(String condition, Object value) {
-            this(condition, value, null);
-        }
-
-        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
-            super();
-            this.condition = condition;
-            this.value = value;
-            this.secondValue = secondValue;
-            this.typeHandler = typeHandler;
-            this.betweenValue = true;
-        }
-
-        protected Criterion(String condition, Object value, Object secondValue) {
-            this(condition, value, secondValue, null);
-        }
-    }
-}

pro-base/src/main/java/com/idea/oa/apply/model/ApplyOffWorkTime.java

@@ -1,159 +0,0 @@
-package com.idea.oa.apply.model;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
-
-public class ApplyOffWorkTime implements Serializable {
-    private String id;
-
-    private String offWorkId;
-
-    private String offWorkType;
-
-    private String timeUnit;
-
-    private BigDecimal useTime;
-
-    private Date startDay;
-
-    private String startTime;
-
-    private Date endDay;
-
-    private String endTime;
-
-    private Integer status;
-
-    private String createdBy;
-
-    private Date createdAt;
-
-    private String updatedBy;
-
-    private Date updatedAt;
-
-    private String remark;
-
-    private static final long serialVersionUID = 1L;
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id == null ? null : id.trim();
-    }
-
-    public String getOffWorkId() {
-        return offWorkId;
-    }
-
-    public void setOffWorkId(String offWorkId) {
-        this.offWorkId = offWorkId == null ? null : offWorkId.trim();
-    }
-
-    public String getOffWorkType() {
-        return offWorkType;
-    }
-
-    public void setOffWorkType(String offWorkType) {
-        this.offWorkType = offWorkType == null ? null : offWorkType.trim();
-    }
-
-    public String getTimeUnit() {
-        return timeUnit;
-    }
-
-    public void setTimeUnit(String timeUnit) {
-        this.timeUnit = timeUnit == null ? null : timeUnit.trim();
-    }
-
-    public BigDecimal getUseTime() {
-        return useTime;
-    }
-
-    public void setUseTime(BigDecimal useTime) {
-        this.useTime = useTime;
-    }
-
-    public Date getStartDay() {
-        return startDay;
-    }
-
-    public void setStartDay(Date startDay) {
-        this.startDay = startDay;
-    }
-
-    public String getStartTime() {
-        return startTime;
-    }
-
-    public void setStartTime(String startTime) {
-        this.startTime = startTime == null ? null : startTime.trim();
-    }
-
-    public Date getEndDay() {
-        return endDay;
-    }
-
-    public void setEndDay(Date endDay) {
-        this.endDay = endDay;
-    }
-
-    public String getEndTime() {
-        return endTime;
-    }
-
-    public void setEndTime(String endTime) {
-        this.endTime = endTime == null ? null : endTime.trim();
-    }
-
-    public Integer getStatus() {
-        return status;
-    }
-
-    public void setStatus(Integer status) {
-        this.status = status;
-    }
-
-    public String getCreatedBy() {
-        return createdBy;
-    }
-
-    public void setCreatedBy(String createdBy) {
-        this.createdBy = createdBy == null ? null : createdBy.trim();
-    }
-
-    public Date getCreatedAt() {
-        return createdAt;
-    }
-
-    public void setCreatedAt(Date createdAt) {
-        this.createdAt = createdAt;
-    }
-
-    public String getUpdatedBy() {
-        return updatedBy;
-    }
-
-    public void setUpdatedBy(String updatedBy) {
-        this.updatedBy = updatedBy == null ? null : updatedBy.trim();
-    }
-
-    public Date getUpdatedAt() {
-        return updatedAt;
-    }
-
-    public void setUpdatedAt(Date updatedAt) {
-        this.updatedAt = updatedAt;
-    }
-
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark == null ? null : remark.trim();
-    }
-}

pro-base/src/main/java/com/idea/oa/apply/model/ApplyPayment.java

@@ -1,279 +0,0 @@
-package com.idea.oa.apply.model;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
-
-public class ApplyPayment implements Serializable {
-    private String id;
-
-    private String orderId;
-
-    private BigDecimal totalReturnMoney;
-
-    private BigDecimal totalPayMoney;
-
-    private String payName;
-
-    private BigDecimal payMoney;
-
-    private String costsType;
-
-    private Integer billType;
-
-    private BigDecimal billMoney;
-
-    private String billNumber;
-
-    private String billRate;
-
-    private String fileDataIds;
-
-    private Integer status;
-
-    private String createdBy;
-
-    private Date createdAt;
-
-    private String updatedBy;
-
-    private Date updatedAt;
-
-    private String remark;
-
-    private Date payTime;
-
-    private String payRemark;
-
-    private String outOrderPayId;
-
-    private String accountType;
-
-    private String spare;
-
-    private String spareInt;
-
-    private String payType;
-
-    private Date makeDate;
-
-    private String makeNum;
-
-    private static final long serialVersionUID = 1L;
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id == null ? null : id.trim();
-    }
-
-    public String getOrderId() {
-        return orderId;
-    }
-
-    public void setOrderId(String orderId) {
-        this.orderId = orderId == null ? null : orderId.trim();
-    }
-
-    public BigDecimal getTotalReturnMoney() {
-        return totalReturnMoney;
-    }
-
-    public void setTotalReturnMoney(BigDecimal totalReturnMoney) {
-        this.totalReturnMoney = totalReturnMoney;
-    }
-
-    public BigDecimal getTotalPayMoney() {
-        return totalPayMoney;
-    }
-
-    public void setTotalPayMoney(BigDecimal totalPayMoney) {
-        this.totalPayMoney = totalPayMoney;
-    }
-
-    public String getPayName() {
-        return payName;
-    }
-
-    public void setPayName(String payName) {
-        this.payName = payName == null ? null : payName.trim();
-    }
-
-    public BigDecimal getPayMoney() {
-        return payMoney;
-    }
-
-    public void setPayMoney(BigDecimal payMoney) {
-        this.payMoney = payMoney;
-    }
-
-    public String getCostsType() {
-        return costsType;
-    }
-
-    public void setCostsType(String costsType) {
-        this.costsType = costsType == null ? null : costsType.trim();
-    }
-
-    public Integer getBillType() {
-        return billType;
-    }
-
-    public void setBillType(Integer billType) {
-        this.billType = billType;
-    }
-
-    public BigDecimal getBillMoney() {
-        return billMoney;
-    }
-
-    public void setBillMoney(BigDecimal billMoney) {
-        this.billMoney = billMoney;
-    }
-
-    public String getBillNumber() {
-        return billNumber;
-    }
-
-    public void setBillNumber(String billNumber) {
-        this.billNumber = billNumber == null ? null : billNumber.trim();
-    }
-
-    public String getBillRate() {
-        return billRate;
-    }
-
-    public void setBillRate(String billRate) {
-        this.billRate = billRate == null ? null : billRate.trim();
-    }
-
-    public String getFileDataIds() {
-        return fileDataIds;
-    }
-
-    public void setFileDataIds(String fileDataIds) {
-        this.fileDataIds = fileDataIds == null ? null : fileDataIds.trim();
-    }
-
-    public Integer getStatus() {
-        return status;
-    }
-
-    public void setStatus(Integer status) {
-        this.status = status;
-    }
-
-    public String getCreatedBy() {
-        return createdBy;
-    }
-
-    public void setCreatedBy(String createdBy) {
-        this.createdBy = createdBy == null ? null : createdBy.trim();
-    }
-
-    public Date getCreatedAt() {
-        return createdAt;
-    }
-
-    public void setCreatedAt(Date createdAt) {
-        this.createdAt = createdAt;
-    }
-
-    public String getUpdatedBy() {
-        return updatedBy;
-    }
-
-    public void setUpdatedBy(String updatedBy) {
-        this.updatedBy = updatedBy == null ? null : updatedBy.trim();
-    }
-
-    public Date getUpdatedAt() {
-        return updatedAt;
-    }
-
-    public void setUpdatedAt(Date updatedAt) {
-        this.updatedAt = updatedAt;
-    }
-
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark == null ? null : remark.trim();
-    }
-
-    public Date getPayTime() {
-        return payTime;
-    }
-
-    public void setPayTime(Date payTime) {
-        this.payTime = payTime;
-    }
-
-    public String getPayRemark() {
-        return payRemark;
-    }
-
-    public void setPayRemark(String payRemark) {
-        this.payRemark = payRemark == null ? null : payRemark.trim();
-    }
-
-    public String getOutOrderPayId() {
-        return outOrderPayId;
-    }
-
-    public void setOutOrderPayId(String outOrderPayId) {
-        this.outOrderPayId = outOrderPayId == null ? null : outOrderPayId.trim();
-    }
-
-    public String getAccountType() {
-        return accountType;
-    }
-
-    public void setAccountType(String accountType) {
-        this.accountType = accountType == null ? null : accountType.trim();
-    }
-
-    public String getSpare() {
-        return spare;
-    }
-
-    public void setSpare(String spare) {
-        this.spare = spare == null ? null : spare.trim();
-    }
-
-    public String getSpareInt() {
-        return spareInt;
-    }
-
-    public void setSpareInt(String spareInt) {
-        this.spareInt = spareInt == null ? null : spareInt.trim();
-    }
-
-    public String getPayType() {
-        return payType;
-    }
-
-    public void setPayType(String payType) {
-        this.payType = payType == null ? null : payType.trim();
-    }
-
-    public Date getMakeDate() {
-        return makeDate;
-    }
-
-    public void setMakeDate(Date makeDate) {
-        this.makeDate = makeDate;
-    }
-
-    public String getMakeNum() {
-        return makeNum;
-    }
-
-    public void setMakeNum(String makeNum) {
-        this.makeNum = makeNum == null ? null : makeNum.trim();
-    }
-}

pro-base/src/main/java/com/idea/oa/apply/model/ApplyPaymentSettle.java

@@ -0,0 +1,209 @@
+package com.idea.oa.apply.model;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+public class ApplyPaymentSettle implements Serializable {
+    private String id;
+
+    private String flowNum;
+
+    private String title;
+
+    private Integer isNoContract;
+
+    private String payerName;
+
+    private String payeeName;
+
+    private String moneyPurpose;
+
+    private BigDecimal contractPrice;
+
+    private String payRemark;
+
+    private BigDecimal havePayMoney;
+
+    private BigDecimal applyPayMoney;
+
+    private String applyPayMoneyUppercase;
+
+    private String fileDataIds;
+
+    private Integer status;
+
+    private String createdByDept;
+
+    private String createdBy;
+
+    private Date createdAt;
+
+    private String updatedBy;
+
+    private Date updatedAt;
+
+    private String remark;
+
+    private static final long serialVersionUID = 1L;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id == null ? null : id.trim();
+    }
+
+    public String getFlowNum() {
+        return flowNum;
+    }
+
+    public void setFlowNum(String flowNum) {
+        this.flowNum = flowNum == null ? null : flowNum.trim();
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title == null ? null : title.trim();
+    }
+
+    public Integer getIsNoContract() {
+        return isNoContract;
+    }
+
+    public void setIsNoContract(Integer isNoContract) {
+        this.isNoContract = isNoContract;
+    }
+
+    public String getPayerName() {
+        return payerName;
+    }
+
+    public void setPayerName(String payerName) {
+        this.payerName = payerName == null ? null : payerName.trim();
+    }
+
+    public String getPayeeName() {
+        return payeeName;
+    }
+
+    public void setPayeeName(String payeeName) {
+        this.payeeName = payeeName == null ? null : payeeName.trim();
+    }
+
+    public String getMoneyPurpose() {
+        return moneyPurpose;
+    }
+
+    public void setMoneyPurpose(String moneyPurpose) {
+        this.moneyPurpose = moneyPurpose == null ? null : moneyPurpose.trim();
+    }
+
+    public BigDecimal getContractPrice() {
+        return contractPrice;
+    }
+
+    public void setContractPrice(BigDecimal contractPrice) {
+        this.contractPrice = contractPrice;
+    }
+
+    public String getPayRemark() {
+        return payRemark;
+    }
+
+    public void setPayRemark(String payRemark) {
+        this.payRemark = payRemark == null ? null : payRemark.trim();
+    }
+
+    public BigDecimal getHavePayMoney() {
+        return havePayMoney;
+    }
+
+    public void setHavePayMoney(BigDecimal havePayMoney) {
+        this.havePayMoney = havePayMoney;
+    }
+
+    public BigDecimal getApplyPayMoney() {
+        return applyPayMoney;
+    }
+
+    public void setApplyPayMoney(BigDecimal applyPayMoney) {
+        this.applyPayMoney = applyPayMoney;
+    }
+
+    public String getApplyPayMoneyUppercase() {
+        return applyPayMoneyUppercase;
+    }
+
+    public void setApplyPayMoneyUppercase(String applyPayMoneyUppercase) {
+        this.applyPayMoneyUppercase = applyPayMoneyUppercase == null ? null : applyPayMoneyUppercase.trim();
+    }
+
+    public String getFileDataIds() {
+        return fileDataIds;
+    }
+
+    public void setFileDataIds(String fileDataIds) {
+        this.fileDataIds = fileDataIds == null ? null : fileDataIds.trim();
+    }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    public String getCreatedByDept() {
+        return createdByDept;
+    }
+
+    public void setCreatedByDept(String createdByDept) {
+        this.createdByDept = createdByDept == null ? null : createdByDept.trim();
+    }
+
+    public String getCreatedBy() {
+        return createdBy;
+    }
+
+    public void setCreatedBy(String createdBy) {
+        this.createdBy = createdBy == null ? null : createdBy.trim();
+    }
+
+    public Date getCreatedAt() {
+        return createdAt;
+    }
+
+    public void setCreatedAt(Date createdAt) {
+        this.createdAt = createdAt;
+    }
+
+    public String getUpdatedBy() {
+        return updatedBy;
+    }
+
+    public void setUpdatedBy(String updatedBy) {
+        this.updatedBy = updatedBy == null ? null : updatedBy.trim();
+    }
+
+    public Date getUpdatedAt() {
+        return updatedAt;
+    }
+
+    public void setUpdatedAt(Date updatedAt) {
+        this.updatedAt = updatedAt;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark == null ? null : remark.trim();
+    }
+}

pro-base/src/main/java/com/idea/oa/apply/model/ApplyPurchase.java

@@ -1,56 +0,0 @@
-package com.idea.oa.apply.model;
-
-import lombok.Data;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
-@Data
-public class ApplyPurchase implements Serializable {
-    private String id;
-
-    private String purchaseCode;
-
-    private String proId;
-
-    private String customerId;
-
-    private Date placeDate;
-
-    private Date requireCompleteTime;
-
-    private String supplierId;
-
-    private BigDecimal orderAmount;
-
-    private BigDecimal taxRate;
-
-    private String amountBelong;
-
-    private String amountBelongType;
-
-    private String payType;
-
-    private String placeUser;
-
-    private Integer purchaseStatus;
-
-    private String createUser;
-
-    private Date createTime;
-
-    private String updateUser;
-
-    private Date updateTime;
-
-    private String groupId;
-
-    private String purchaseContent;
-
-    private String purchaseFile;
-
-    private String payContent;
-
-    private static final long serialVersionUID = 1L;
-
-}

pro-base/src/main/java/com/idea/oa/apply/model/ApplyUseMoney.java

@@ -1,208 +0,0 @@
-package com.idea.oa.apply.model;
-
-import java.io.Serializable;
-import java.util.Date;
-
-public class ApplyUseMoney implements Serializable {
-    private String id;
-
-    private String proId;
-
-    private String useReasons;
-
-    private String payeeName;
-
-    private String bankName;
-
-    private String bankAccountNum;
-
-    private String makeNum;
-
-    private Date makeDate;
-
-    private Integer status;
-
-    private String createdBy;
-
-    private Date createdAt;
-
-    private String updatedBy;
-
-    private Date updatedAt;
-
-    private String remark;
-
-    private String payType;
-
-    private Date payTime;
-
-    private String payRemark;
-
-    private String accountType;
-
-    private String spare;
-
-    private String spareInt;
-
-    private static final long serialVersionUID = 1L;
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id == null ? null : id.trim();
-    }
-
-    public String getProId() {
-        return proId;
-    }
-
-    public void setProId(String proId) {
-        this.proId = proId == null ? null : proId.trim();
-    }
-
-    public String getUseReasons() {
-        return useReasons;
-    }
-
-    public void setUseReasons(String useReasons) {
-        this.useReasons = useReasons == null ? null : useReasons.trim();
-    }
-
-    public String getPayeeName() {
-        return payeeName;
-    }
-
-    public void setPayeeName(String payeeName) {
-        this.payeeName = payeeName == null ? null : payeeName.trim();
-    }
-
-    public String getBankName() {
-        return bankName;
-    }
-
-    public void setBankName(String bankName) {
-        this.bankName = bankName == null ? null : bankName.trim();
-    }
-
-    public String getBankAccountNum() {
-        return bankAccountNum;
-    }
-
-    public void setBankAccountNum(String bankAccountNum) {
-        this.bankAccountNum = bankAccountNum == null ? null : bankAccountNum.trim();
-    }
-
-    public String getMakeNum() {
-        return makeNum;
-    }
-
-    public void setMakeNum(String makeNum) {
-        this.makeNum = makeNum == null ? null : makeNum.trim();
-    }
-
-    public Date getMakeDate() {
-        return makeDate;
-    }
-
-    public void setMakeDate(Date makeDate) {
-        this.makeDate = makeDate;
-    }
-
-    public Integer getStatus() {
-        return status;
-    }
-
-    public void setStatus(Integer status) {
-        this.status = status;
-    }
-
-    public String getCreatedBy() {
-        return createdBy;
-    }
-
-    public void setCreatedBy(String createdBy) {
-        this.createdBy = createdBy == null ? null : createdBy.trim();
-    }
-
-    public Date getCreatedAt() {
-        return createdAt;
-    }
-
-    public void setCreatedAt(Date createdAt) {
-        this.createdAt = createdAt;
-    }
-
-    public String getUpdatedBy() {
-        return updatedBy;
-    }
-
-    public void setUpdatedBy(String updatedBy) {
-        this.updatedBy = updatedBy == null ? null : updatedBy.trim();
-    }
-
-    public Date getUpdatedAt() {
-        return updatedAt;
-    }
-
-    public void setUpdatedAt(Date updatedAt) {
-        this.updatedAt = updatedAt;
-    }
-
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark == null ? null : remark.trim();
-    }
-
-    public String getPayType() {
-        return payType;
-    }
-
-    public void setPayType(String payType) {
-        this.payType = payType == null ? null : payType.trim();
-    }
-
-    public Date getPayTime() {
-        return payTime;
-    }
-
-    public void setPayTime(Date payTime) {
-        this.payTime = payTime;
-    }
-
-    public String getPayRemark() {
-        return payRemark;
-    }
-
-    public void setPayRemark(String payRemark) {
-        this.payRemark = payRemark == null ? null : payRemark.trim();
-    }
-
-    public String getAccountType() {
-        return accountType;
-    }
-
-    public void setAccountType(String accountType) {
-        this.accountType = accountType == null ? null : accountType.trim();
-    }
-
-    public String getSpare() {
-        return spare;
-    }
-
-    public void setSpare(String spare) {
-        this.spare = spare == null ? null : spare.trim();
-    }
-
-    public String getSpareInt() {
-        return spareInt;
-    }
-
-    public void setSpareInt(String spareInt) {
-        this.spareInt = spareInt == null ? null : spareInt.trim();
-    }
-}

pro-base/src/main/java/com/idea/oa/apply/model/ApplyUseMoneyDetail.java

@@ -1,139 +0,0 @@
-package com.idea.oa.apply.model;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
-
-public class ApplyUseMoneyDetail implements Serializable {
-    private String id;
-
-    private String useMoneyId;
-
-    private String feeType;
-
-    private BigDecimal feeMoney;
-
-    private String fileDataIds;
-
-    private Integer fileType;
-
-    private String fileNumber;
-
-    private Integer status;
-
-    private String createdBy;
-
-    private Date createdAt;
-
-    private String updatedBy;
-
-    private Date updatedAt;
-
-    private String remark;
-
-    private static final long serialVersionUID = 1L;
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id == null ? null : id.trim();
-    }
-
-    public String getUseMoneyId() {
-        return useMoneyId;
-    }
-
-    public void setUseMoneyId(String useMoneyId) {
-        this.useMoneyId = useMoneyId == null ? null : useMoneyId.trim();
-    }
-
-    public String getFeeType() {
-        return feeType;
-    }
-
-    public void setFeeType(String feeType) {
-        this.feeType = feeType == null ? null : feeType.trim();
-    }
-
-    public BigDecimal getFeeMoney() {
-        return feeMoney;
-    }
-
-    public void setFeeMoney(BigDecimal feeMoney) {
-        this.feeMoney = feeMoney;
-    }
-
-    public String getFileDataIds() {
-        return fileDataIds;
-    }
-
-    public void setFileDataIds(String fileDataIds) {
-        this.fileDataIds = fileDataIds == null ? null : fileDataIds.trim();
-    }
-
-    public Integer getFileType() {
-        return fileType;
-    }
-
-    public void setFileType(Integer fileType) {
-        this.fileType = fileType;
-    }
-
-    public String getFileNumber() {
-        return fileNumber;
-    }
-
-    public void setFileNumber(String fileNumber) {
-        this.fileNumber = fileNumber == null ? null : fileNumber.trim();
-    }
-
-    public Integer getStatus() {
-        return status;
-    }
-
-    public void setStatus(Integer status) {
-        this.status = status;
-    }
-
-    public String getCreatedBy() {
-        return createdBy;
-    }
-
-    public void setCreatedBy(String createdBy) {
-        this.createdBy = createdBy == null ? null : createdBy.trim();
-    }
-
-    public Date getCreatedAt() {
-        return createdAt;
-    }
-
-    public void setCreatedAt(Date createdAt) {
-        this.createdAt = createdAt;
-    }
-
-    public String getUpdatedBy() {
-        return updatedBy;
-    }
-
-    public void setUpdatedBy(String updatedBy) {
-        this.updatedBy = updatedBy == null ? null : updatedBy.trim();
-    }
-
-    public Date getUpdatedAt() {
-        return updatedAt;
-    }
-
-    public void setUpdatedAt(Date updatedAt) {
-        this.updatedAt = updatedAt;
-    }
-
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark == null ? null : remark.trim();
-    }
-}

pro-base/src/main/java/com/idea/oa/apply/model/inout/AddConfirmResultUseMoney.java

@@ -1,92 +0,0 @@
-package com.idea.oa.apply.model.inout;
-
-import java.util.Date;
-
-public class AddConfirmResultUseMoney extends AddConfirmResult{
-
-
-    @Override
-    public String toString() {
-        return super.toString()+"AddConfirmResultUseMoney{" +
-                "payTime=" + payTime +
-                ", payRemark='" + payRemark + '\'' +
-                ", applyUseMoneyDetailListString='" + applyUseMoneyDetailListString + '\'' +
-                ", payType='" + payType + '\'' +
-                ", makeNum='" + makeNum + '\'' +
-                ", makeDate=" + makeDate +
-                '}';
-    }
-
-
-    private Date payTime;
-
-    private String payRemark;
-    // 费用明细的修改
-    //json格式的数据组
-    private String applyUseMoneyDetailListString;
-    // 付款类型 电汇/现金(对应的字典值)
-    private String payType;
-
-    //制单号列表展示
-    private String makeNum;
-    //制单日期
-    private Date makeDate;
-    // 付款账户 字典值 ACCOUNT
-    private String accountType;
-
-    public String getAccountType() {
-        return accountType;
-    }
-
-    public void setAccountType(String accountType) {
-        this.accountType = accountType;
-    }
-
-    public Date getPayTime() {
-        return payTime;
-    }
-
-    public void setPayTime(Date payTime) {
-        this.payTime = payTime;
-    }
-
-    public String getPayRemark() {
-        return payRemark;
-    }
-
-    public void setPayRemark(String payRemark) {
-        this.payRemark = payRemark;
-    }
-
-    public String getPayType() {
-        return payType;
-    }
-
-    public void setPayType(String payType) {
-        this.payType = payType;
-    }
-
-    public String getMakeNum() {
-        return makeNum;
-    }
-
-    public String getApplyUseMoneyDetailListString() {
-        return applyUseMoneyDetailListString;
-    }
-
-    public void setApplyUseMoneyDetailListString(String applyUseMoneyDetailListString) {
-        this.applyUseMoneyDetailListString = applyUseMoneyDetailListString;
-    }
-
-    public void setMakeNum(String makeNum) {
-        this.makeNum = makeNum;
-    }
-
-    public Date getMakeDate() {
-        return makeDate;
-    }
-
-    public void setMakeDate(Date makeDate) {
-        this.makeDate = makeDate;
-    }
-}

pro-base/src/main/java/com/idea/oa/apply/model/inout/ApplyOffWorkIn.java

@@ -1,94 +0,0 @@
-package com.idea.oa.apply.model.inout;
-
-import com.idea.oa.apply.model.ApplyOffWork;
-import com.idea.oa.apply.model.ApplyOffWorkTime;
-import com.idea.oa.flow2.model.in.FlowMainCcVo;
-
-import java.util.List;
-
-public class ApplyOffWorkIn extends ApplyOffWork {
-    @Override
-    public String toString() {
-        return super.toString()+"ApplyOffWorkIn{" +
-                "applyOffWorkTimeList=" + applyOffWorkTimeList +
-                ", applyOffWorkTimeString='" + applyOffWorkTimeString + '\'' +
-                ", ccList='" + ccList + '\'' +
-                ", flowMainCcList=" + flowMainCcList +
-                ", flowMainPushId='" + flowMainPushId + '\'' +
-                ", flowMainId='" + flowMainId + '\'' +
-                '}';
-    }
-
-    private String createdByString;
-
-    private List<ApplyOffWorkTime> applyOffWorkTimeList;
-    //json格式的数据组
-    private String applyOffWorkTimeString;
-
-    // 抄送人列表格式例如:,张三,李四,
-    private String ccList;
-
-    private List<FlowMainCcVo> flowMainCcList;
-
-    // 推送表id
-    private String flowMainPushId;
-
-    // 原来的流程id
-    private String flowMainId;
-
-    public String getCreatedByString() {
-        return createdByString;
-    }
-
-    public void setCreatedByString(String createdByString) {
-        this.createdByString = createdByString;
-    }
-
-    public List<ApplyOffWorkTime> getApplyOffWorkTimeList() {
-        return applyOffWorkTimeList;
-    }
-
-    public void setApplyOffWorkTimeList(List<ApplyOffWorkTime> applyOffWorkTimeList) {
-        this.applyOffWorkTimeList = applyOffWorkTimeList;
-    }
-
-    public String getApplyOffWorkTimeString() {
-        return applyOffWorkTimeString;
-    }
-
-    public void setApplyOffWorkTimeString(String applyOffWorkTimeString) {
-        this.applyOffWorkTimeString = applyOffWorkTimeString;
-    }
-
-    public String getCcList() {
-        return ccList;
-    }
-
-    public void setCcList(String ccList) {
-        this.ccList = ccList;
-    }
-
-    public List<FlowMainCcVo> getFlowMainCcList() {
-        return flowMainCcList;
-    }
-
-    public void setFlowMainCcList(List<FlowMainCcVo> flowMainCcList) {
-        this.flowMainCcList = flowMainCcList;
-    }
-
-    public String getFlowMainPushId() {
-        return flowMainPushId;
-    }
-
-    public void setFlowMainPushId(String flowMainPushId) {
-        this.flowMainPushId = flowMainPushId;
-    }
-
-    public String getFlowMainId() {
-        return flowMainId;
-    }
-
-    public void setFlowMainId(String flowMainId) {
-        this.flowMainId = flowMainId;
-    }
-}

pro-base/src/main/java/com/idea/oa/apply/model/inout/ApplyPaymentIn.java

@@ -1,115 +0,0 @@
-package com.idea.oa.apply.model.inout;
-
-import com.idea.oa.apply.model.ApplyPayment;
-import com.idea.oa.flow2.model.in.FlowMainCcVo;
-
-import java.util.List;
-
-public class ApplyPaymentIn extends ApplyPayment {
-    @Override
-    public String toString() {
-        return super.toString()+
-                "==>ApplyPaymentIn{" +
-                "flowMainId='" + flowMainId + '\'' +
-                ", customerName='" + customerName + '\'' +
-                ", projectName='" + projectName + '\'' +
-                ", supplierName='" + supplierName + '\'' +
-                ", ccList='" + ccList + '\'' +
-                '}';
-    }
-
-    public String pushUserKey;
-    //创建人名称
-   private String createdByString;
-
-    // 原来的流程id
-    private String flowMainId;
-//    客户名称(传入的时候用到)
-    private String customerName;
-//    项目名称(传入的时候用到)
-    private String projectName;
-//    供应商名称(传入的时候用到)
-    private String supplierName;
-
-    // 抄送人列表格式例如:,张三,李四,
-    private String ccList;
-
-    private List<FlowMainCcVo> flowMainCcList;
-
-    // 推送表id
-    private String flowMainPushId;
-
-    public String getPushUserKey() {
-        return pushUserKey;
-    }
-
-    public void setPushUserKey(String pushUserKey) {
-        this.pushUserKey = pushUserKey;
-    }
-
-    public String getCreatedByString() {
-        return createdByString;
-    }
-
-    public void setCreatedByString(String createdByString) {
-        this.createdByString = createdByString;
-    }
-
-    public String getFlowMainPushId() {
-        return flowMainPushId;
-    }
-
-    public void setFlowMainPushId(String flowMainPushId) {
-        this.flowMainPushId = flowMainPushId;
-    }
-
-    public List<FlowMainCcVo> getFlowMainCcList() {
-        return flowMainCcList;
-    }
-
-    public void setFlowMainCcList(List<FlowMainCcVo> flowMainCcList) {
-        this.flowMainCcList = flowMainCcList;
-    }
-
-    public String getFlowMainId() {
-        return flowMainId;
-    }
-
-    public void setFlowMainId(String flowMainId) {
-        this.flowMainId = flowMainId;
-    }
-
-
-
-    public String getProjectName() {
-        return projectName;
-    }
-
-    public void setProjectName(String projectName) {
-        this.projectName = projectName;
-    }
-
-    public String getSupplierName() {
-        return supplierName;
-    }
-
-    public void setSupplierName(String supplierName) {
-        this.supplierName = supplierName;
-    }
-
-    public String getCustomerName() {
-        return customerName;
-    }
-
-    public void setCustomerName(String customerName) {
-        this.customerName = customerName;
-    }
-
-    public String getCcList() {
-        return ccList;
-    }
-
-    public void setCcList(String ccList) {
-        this.ccList = ccList;
-    }
-}

pro-base/src/main/java/com/idea/oa/apply/model/inout/ApplyPurchaseIn.java

@@ -1,76 +0,0 @@
-package com.idea.oa.apply.model.inout;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.idea.oa.flow2.model.in.FlowMainCcVo;
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.util.Date;
-import java.util.List;
-@Data
-public class ApplyPurchaseIn {
-
-    private String currUserName;
-
-    private String ccList;
-
-    private List<FlowMainCcVo> flowMainCcList;
-
-    // 推送表id
-    private String flowMainPushId;
-
-    // 原来的流程id
-    private String flowMainId;
-
-    private String proName;
-    private String custName;
-    private String contactUser;
-
-    // ============================================
-    // 原表字段
-    private String id;
-
-    private String purchaseCode;
-
-    private String proId;
-
-    private String customerId;
-
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private Date placeDate;
-
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private Date requireCompleteTime;
-
-    private String supplierId;
-
-    private BigDecimal orderAmount;
-
-    private BigDecimal taxRate;
-
-    private String amountBelong;
-
-    private String amountBelongType;
-
-    private String payType;
-
-    private String placeUser;
-
-    private Integer purchaseStatus;
-
-    private String createUser;
-
-    private Date createTime;
-
-    private String updateUser;
-
-    private Date updateTime;
-
-    private String groupId;
-
-    private String purchaseContent;
-
-    private String purchaseFile;
-
-    private String payContent;
-}

pro-base/src/main/java/com/idea/oa/apply/model/inout/ApplyUseMoneyIn.java

@@ -1,124 +0,0 @@
-package com.idea.oa.apply.model.inout;
-
-import com.idea.oa.apply.model.ApplyUseMoney;
-import com.idea.oa.apply.model.ApplyUseMoneyDetail;
-import com.idea.oa.flow2.model.in.FlowMainCcVo;
-
-import java.util.List;
-
-public class ApplyUseMoneyIn extends ApplyUseMoney {
-
-    @Override
-    public String toString() {
-        return super.toString()+"ApplyUseMoneyIn{" +
-                "applyUseMoneyDetailList=" + applyUseMoneyDetailList +
-                ", applyUseMoneyDetailListString='" + applyUseMoneyDetailListString + '\'' +
-                ", ccList='" + ccList + '\'' +
-                ", flowMainCcList=" + flowMainCcList +
-                ", flowMainPushId='" + flowMainPushId + '\'' +
-                ", flowMainId='" + flowMainId + '\'' +
-                ", proMainName='" + proMainName + '\'' +
-                ", feeMoneyTotal=" + feeMoneyTotal +
-                '}';
-    }
-
-    public String pushUserKey;
-    private String createdByString;
-
-    private List<ApplyUseMoneyDetail> applyUseMoneyDetailList;
-    //json格式的数据组
-    private String applyUseMoneyDetailListString;
-    // 抄送人列表格式例如:,张三,李四,
-    private String ccList;
-
-    private List<FlowMainCcVo> flowMainCcList;
-
-    // 推送表id
-    private String flowMainPushId;
-
-    // 原来的流程id
-    private String flowMainId;
-    //项目名称
-    private String proMainName;
-    // 申请的总金额
-    private Double feeMoneyTotal;
-
-    public String getPushUserKey() {
-        return pushUserKey;
-    }
-
-    public void setPushUserKey(String pushUserKey) {
-        this.pushUserKey = pushUserKey;
-    }
-
-    public Double getFeeMoneyTotal() {
-        return feeMoneyTotal;
-    }
-
-    public String getCreatedByString() {
-        return createdByString;
-    }
-
-    public void setCreatedByString(String createdByString) {
-        this.createdByString = createdByString;
-    }
-
-    public void setFeeMoneyTotal(Double feeMoneyTotal) {
-        this.feeMoneyTotal = feeMoneyTotal;
-    }
-
-    public List<FlowMainCcVo> getFlowMainCcList() {
-        return flowMainCcList;
-    }
-
-    public void setFlowMainCcList(List<FlowMainCcVo> flowMainCcList) {
-        this.flowMainCcList = flowMainCcList;
-    }
-
-    public String getProMainName() {
-        return proMainName;
-    }
-
-    public void setProMainName(String proMainName) {
-        this.proMainName = proMainName;
-    }
-
-    public String getFlowMainPushId() {
-        return flowMainPushId;
-    }
-
-    public void setFlowMainPushId(String flowMainPushId) {
-        this.flowMainPushId = flowMainPushId;
-    }
-
-    public List<ApplyUseMoneyDetail> getApplyUseMoneyDetailList() {
-        return applyUseMoneyDetailList;
-    }
-
-    public void setApplyUseMoneyDetailList(List<ApplyUseMoneyDetail> applyUseMoneyDetailList) {
-        this.applyUseMoneyDetailList = applyUseMoneyDetailList;
-    }
-
-    public String getApplyUseMoneyDetailListString() {
-        return applyUseMoneyDetailListString;
-    }
-
-    public void setApplyUseMoneyDetailListString(String applyUseMoneyDetailListString) {
-        this.applyUseMoneyDetailListString = applyUseMoneyDetailListString;
-    }
-    public String getCcList() {
-        return ccList;
-    }
-
-    public void setCcList(String ccList) {
-        this.ccList = ccList;
-    }
-
-    public String getFlowMainId() {
-        return flowMainId;
-    }
-
-    public void setFlowMainId(String flowMainId) {
-        this.flowMainId = flowMainId;
-    }
-}

pro-base/src/main/java/com/idea/oa/apply/model/inout/UseDays.java

@@ -1,45 +0,0 @@
-package com.idea.oa.apply.model.inout;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-public class UseDays {
-
-    private Date doDay;
-    private Date startTime;
-    private Date endTime;
-    private BigDecimal useTime;
-
-
-    public Date getDoDay() {
-        return doDay;
-    }
-
-    public void setDoDay(Date doDay) {
-        this.doDay = doDay;
-    }
-
-    public Date getStartTime() {
-        return startTime;
-    }
-
-    public void setStartTime(Date startTime) {
-        this.startTime = startTime;
-    }
-
-    public Date getEndTime() {
-        return endTime;
-    }
-
-    public void setEndTime(Date endTime) {
-        this.endTime = endTime;
-    }
-
-    public BigDecimal getUseTime() {
-        return useTime;
-    }
-
-    public void setUseTime(BigDecimal useTime) {
-        this.useTime = useTime;
-    }
-}

pro-base/src/main/java/com/idea/oa/apply/util/constant/ConstantFlowType.java

@@ -1,6 +1,7 @@
 package com.idea.oa.apply.util.constant;
 
 import java.util.HashMap;
+import java.util.Locale;
 import java.util.Map;
 
 /**
@@ -133,4 +134,23 @@ public class ConstantFlowType {
     public static String[] PURCHASE_WORK_FLOW_STEPS={"curr_user", "dept_superior_1_0_1", "dept_head_1_0_1",
             "flow_fgld_1_0_1", "flow_sjfgld_1_0_1", "flow_zyld_1_0_1", "flow_cgzy_1_0_1"};
 
+
+
+    //===============================================================================
+    // 新项目的付款申请
+    public final static String PAYMENT = "payment";
+    public final static String PAYMENT_NAME = "付款申请";
+    public final static String PAYMENT_PROCESSDEFINE = "applyPayment";//自己瞎写的  todo 要对应resources/processes目录下的对应bpmn文件 process id="xxx"
+    public static String PAYMENT_DEPLOYMENTID = "20004";//自己瞎写的
+    //流程顺序
+    public static String[] PAYMENT_FLOWSTEPS={"curr_user", "dept_superior_1_0_1", "dept_head_1_0_1", "flow_fgld_1_0_1", "flow_sjfgld_1_0_1", "flow_zyld_1_0_1"};
+//    key="curr_user"      name="申请人发起"
+//    key="dept_superior_1_0_1"      name="直接上级审核"
+//    key="dept_head_1_0_1"      name="部门负责人审核"
+//    key="flow_fgld_1_0_1"      name="分管领导审核"
+//    key="flow_sjfgld_1_0_1"      name="上级分管领导审核"
+//    key="flow_zyld_1_0_1"      name="主要领导审核"
+
+
+
 }

pro-base/src/main/java/com/idea/oa/apply/util/service/RunerLoadOneService.java

@@ -23,27 +23,31 @@ public class RunerLoadOneService {
         example.createCriteria().andStatusEqualTo("1");
         List<FlowDefinition> flowDefinitions = flowDefinitionService.selectByExample(example);
         for (FlowDefinition flowDefinition : flowDefinitions) {
-            if (ConstantFlowType.USE_MONEY_PROCESSDEFINE.equals(flowDefinition.getFlowDef())) {
-                ConstantFlowType.USE_MONEY_DEPLOYMENTID=flowDefinition.getDeployId();
-            }
-            if (ConstantFlowType.PAYMEN_PROCESSDEFINE.equals(flowDefinition.getFlowDef())) {
-                ConstantFlowType.PAYMEN_DEPLOYMENTID=flowDefinition.getDeployId();
-            }
-            if (ConstantFlowType.OFF_WORK_PROCESSDEFINE.equals(flowDefinition.getFlowDef())) {
-                ConstantFlowType.OFF_WORK_DEPLOYMENTID=flowDefinition.getDeployId();
-            }
+//            if (ConstantFlowType.USE_MONEY_PROCESSDEFINE.equals(flowDefinition.getFlowDef())) {
+//                ConstantFlowType.USE_MONEY_DEPLOYMENTID=flowDefinition.getDeployId();
+//            }
+//            if (ConstantFlowType.PAYMEN_PROCESSDEFINE.equals(flowDefinition.getFlowDef())) {
+//                ConstantFlowType.PAYMEN_DEPLOYMENTID=flowDefinition.getDeployId();
+//            }
+//            if (ConstantFlowType.OFF_WORK_PROCESSDEFINE.equals(flowDefinition.getFlowDef())) {
+//                ConstantFlowType.OFF_WORK_DEPLOYMENTID=flowDefinition.getDeployId();
+//            }
             if (ConstantFlowType.ADD_WORK_PROCESSDEFINE.equals(flowDefinition.getFlowDef())) {
                 ConstantFlowType.ADD_WORK_DEPLOYMENTID=flowDefinition.getDeployId();
             }
-            if (ConstantFlowType.PURCHASE_WORK_PROCESS_DEFINE.equals(flowDefinition.getFlowDef())) {
-                ConstantFlowType.PURCHASE_WORK_DEPLOYMENT_ID=flowDefinition.getDeployId();
+//            if (ConstantFlowType.PURCHASE_WORK_PROCESS_DEFINE.equals(flowDefinition.getFlowDef())) {
+//                ConstantFlowType.PURCHASE_WORK_DEPLOYMENT_ID=flowDefinition.getDeployId();
+//            }
+            if (ConstantFlowType.PAYMENT_PROCESSDEFINE.equals(flowDefinition.getFlowDef())) {
+                ConstantFlowType.PAYMENT_DEPLOYMENTID=flowDefinition.getDeployId();
             }
         }
-        System.out.println(ConstantFlowType.USE_MONEY_PROCESSDEFINE+"流程编号为:"+ConstantFlowType.USE_MONEY_DEPLOYMENTID);
-        System.out.println(ConstantFlowType.PAYMEN_PROCESSDEFINE+"流程编号为:"+ConstantFlowType.PAYMEN_DEPLOYMENTID);
-        System.out.println(ConstantFlowType.OFF_WORK_PROCESSDEFINE+"流程编号为:"+ConstantFlowType.OFF_WORK_DEPLOYMENTID);
+//        System.out.println(ConstantFlowType.USE_MONEY_PROCESSDEFINE+"流程编号为:"+ConstantFlowType.USE_MONEY_DEPLOYMENTID);
+//        System.out.println(ConstantFlowType.PAYMEN_PROCESSDEFINE+"流程编号为:"+ConstantFlowType.PAYMEN_DEPLOYMENTID);
+//        System.out.println(ConstantFlowType.OFF_WORK_PROCESSDEFINE+"流程编号为:"+ConstantFlowType.OFF_WORK_DEPLOYMENTID);
         System.out.println(ConstantFlowType.ADD_WORK_PROCESSDEFINE+"流程编号为:"+ConstantFlowType.ADD_WORK_DEPLOYMENTID);
-        System.out.println(ConstantFlowType.PURCHASE_WORK_PROCESS_DEFINE+"流程编号为:"+ConstantFlowType.PURCHASE_WORK_DEPLOYMENT_ID);
+//        System.out.println(ConstantFlowType.PURCHASE_WORK_PROCESS_DEFINE+"流程编号为:"+ConstantFlowType.PURCHASE_WORK_DEPLOYMENT_ID);
+        System.out.println(ConstantFlowType.PAYMENT_PROCESSDEFINE+"流程编号为:"+ConstantFlowType.PAYMENT_DEPLOYMENTID);
 
     }
 

pro-base/src/main/java/com/idea/oa/flow2/service/FlowMainService.java

@@ -3,10 +3,7 @@ package com.idea.oa.flow2.service;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.idea.oa.activiti.service.ProActiService;
-import com.idea.oa.apply.model.ApplyOffWorkTime;
-import com.idea.oa.apply.model.ApplyOffWorkTimeExample;
-import com.idea.oa.apply.model.ApplyUseMoneyDetail;
-import com.idea.oa.apply.model.ApplyUseMoneyDetailExample;
+
 import com.idea.oa.apply.model.inout.AddConfirmResult;
 import com.idea.oa.apply.model.inout.OperaterManage;
 //import com.idea.oa.apply.service.ApplyOffWorkTimeService;

pro-base/src/main/resources/mybatis/apply/ApplyPaymentSettleMapper.xml

@@ -0,0 +1,448 @@
+<?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.idea.oa.apply.mapper.ApplyPaymentSettleMapper">
+  <resultMap id="BaseResultMap" type="com.idea.oa.apply.model.ApplyPaymentSettle">
+    <id column="id" jdbcType="VARCHAR" property="id" />
+    <result column="flow_num" jdbcType="VARCHAR" property="flowNum" />
+    <result column="title" jdbcType="VARCHAR" property="title" />
+    <result column="is_no_contract" jdbcType="INTEGER" property="isNoContract" />
+    <result column="payer_name" jdbcType="VARCHAR" property="payerName" />
+    <result column="payee_name" jdbcType="VARCHAR" property="payeeName" />
+    <result column="money_purpose" jdbcType="VARCHAR" property="moneyPurpose" />
+    <result column="contract_price" jdbcType="DECIMAL" property="contractPrice" />
+    <result column="pay_remark" jdbcType="VARCHAR" property="payRemark" />
+    <result column="have_pay_money" jdbcType="DECIMAL" property="havePayMoney" />
+    <result column="apply_pay_money" jdbcType="DECIMAL" property="applyPayMoney" />
+    <result column="apply_pay_money_uppercase" jdbcType="VARCHAR" property="applyPayMoneyUppercase" />
+    <result column="file_data_ids" jdbcType="VARCHAR" property="fileDataIds" />
+    <result column="status" jdbcType="INTEGER" property="status" />
+    <result column="created_by_dept" jdbcType="VARCHAR" property="createdByDept" />
+    <result column="created_by" jdbcType="VARCHAR" property="createdBy" />
+    <result column="created_at" jdbcType="TIMESTAMP" property="createdAt" />
+    <result column="updated_by" jdbcType="VARCHAR" property="updatedBy" />
+    <result column="updated_at" jdbcType="TIMESTAMP" property="updatedAt" />
+    <result column="remark" jdbcType="VARCHAR" property="remark" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    id, flow_num, title, is_no_contract, payer_name, payee_name, money_purpose, contract_price, 
+    pay_remark, have_pay_money, apply_pay_money, apply_pay_money_uppercase, file_data_ids, 
+    status, created_by_dept, created_by, created_at, updated_by, updated_at, remark
+  </sql>
+  <select id="selectByExample" parameterType="com.idea.oa.apply.model.ApplyPaymentSettleExample" resultMap="BaseResultMap">
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from apply_payment_settle
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
+    select 
+    <include refid="Base_Column_List" />
+    from apply_payment_settle
+    where id = #{id,jdbcType=VARCHAR}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+    delete from apply_payment_settle
+    where id = #{id,jdbcType=VARCHAR}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.idea.oa.apply.model.ApplyPaymentSettleExample">
+    delete from apply_payment_settle
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.idea.oa.apply.model.ApplyPaymentSettle">
+    insert into apply_payment_settle (id, flow_num, title, 
+      is_no_contract, payer_name, payee_name, 
+      money_purpose, contract_price, pay_remark, 
+      have_pay_money, apply_pay_money, apply_pay_money_uppercase, 
+      file_data_ids, status, created_by_dept, 
+      created_by, created_at, updated_by, 
+      updated_at, remark)
+    values (#{id,jdbcType=VARCHAR}, #{flowNum,jdbcType=VARCHAR}, #{title,jdbcType=VARCHAR}, 
+      #{isNoContract,jdbcType=INTEGER}, #{payerName,jdbcType=VARCHAR}, #{payeeName,jdbcType=VARCHAR}, 
+      #{moneyPurpose,jdbcType=VARCHAR}, #{contractPrice,jdbcType=DECIMAL}, #{payRemark,jdbcType=VARCHAR}, 
+      #{havePayMoney,jdbcType=DECIMAL}, #{applyPayMoney,jdbcType=DECIMAL}, #{applyPayMoneyUppercase,jdbcType=VARCHAR}, 
+      #{fileDataIds,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER}, #{createdByDept,jdbcType=VARCHAR}, 
+      #{createdBy,jdbcType=VARCHAR}, #{createdAt,jdbcType=TIMESTAMP}, #{updatedBy,jdbcType=VARCHAR}, 
+      #{updatedAt,jdbcType=TIMESTAMP}, #{remark,jdbcType=VARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="com.idea.oa.apply.model.ApplyPaymentSettle">
+    insert into apply_payment_settle
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="flowNum != null">
+        flow_num,
+      </if>
+      <if test="title != null">
+        title,
+      </if>
+      <if test="isNoContract != null">
+        is_no_contract,
+      </if>
+      <if test="payerName != null">
+        payer_name,
+      </if>
+      <if test="payeeName != null">
+        payee_name,
+      </if>
+      <if test="moneyPurpose != null">
+        money_purpose,
+      </if>
+      <if test="contractPrice != null">
+        contract_price,
+      </if>
+      <if test="payRemark != null">
+        pay_remark,
+      </if>
+      <if test="havePayMoney != null">
+        have_pay_money,
+      </if>
+      <if test="applyPayMoney != null">
+        apply_pay_money,
+      </if>
+      <if test="applyPayMoneyUppercase != null">
+        apply_pay_money_uppercase,
+      </if>
+      <if test="fileDataIds != null">
+        file_data_ids,
+      </if>
+      <if test="status != null">
+        status,
+      </if>
+      <if test="createdByDept != null">
+        created_by_dept,
+      </if>
+      <if test="createdBy != null">
+        created_by,
+      </if>
+      <if test="createdAt != null">
+        created_at,
+      </if>
+      <if test="updatedBy != null">
+        updated_by,
+      </if>
+      <if test="updatedAt != null">
+        updated_at,
+      </if>
+      <if test="remark != null">
+        remark,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=VARCHAR},
+      </if>
+      <if test="flowNum != null">
+        #{flowNum,jdbcType=VARCHAR},
+      </if>
+      <if test="title != null">
+        #{title,jdbcType=VARCHAR},
+      </if>
+      <if test="isNoContract != null">
+        #{isNoContract,jdbcType=INTEGER},
+      </if>
+      <if test="payerName != null">
+        #{payerName,jdbcType=VARCHAR},
+      </if>
+      <if test="payeeName != null">
+        #{payeeName,jdbcType=VARCHAR},
+      </if>
+      <if test="moneyPurpose != null">
+        #{moneyPurpose,jdbcType=VARCHAR},
+      </if>
+      <if test="contractPrice != null">
+        #{contractPrice,jdbcType=DECIMAL},
+      </if>
+      <if test="payRemark != null">
+        #{payRemark,jdbcType=VARCHAR},
+      </if>
+      <if test="havePayMoney != null">
+        #{havePayMoney,jdbcType=DECIMAL},
+      </if>
+      <if test="applyPayMoney != null">
+        #{applyPayMoney,jdbcType=DECIMAL},
+      </if>
+      <if test="applyPayMoneyUppercase != null">
+        #{applyPayMoneyUppercase,jdbcType=VARCHAR},
+      </if>
+      <if test="fileDataIds != null">
+        #{fileDataIds,jdbcType=VARCHAR},
+      </if>
+      <if test="status != null">
+        #{status,jdbcType=INTEGER},
+      </if>
+      <if test="createdByDept != null">
+        #{createdByDept,jdbcType=VARCHAR},
+      </if>
+      <if test="createdBy != null">
+        #{createdBy,jdbcType=VARCHAR},
+      </if>
+      <if test="createdAt != null">
+        #{createdAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updatedBy != null">
+        #{updatedBy,jdbcType=VARCHAR},
+      </if>
+      <if test="updatedAt != null">
+        #{updatedAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="remark != null">
+        #{remark,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.idea.oa.apply.model.ApplyPaymentSettleExample" resultType="java.lang.Long">
+    select count(*) from apply_payment_settle
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    update apply_payment_settle
+    <set>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=VARCHAR},
+      </if>
+      <if test="record.flowNum != null">
+        flow_num = #{record.flowNum,jdbcType=VARCHAR},
+      </if>
+      <if test="record.title != null">
+        title = #{record.title,jdbcType=VARCHAR},
+      </if>
+      <if test="record.isNoContract != null">
+        is_no_contract = #{record.isNoContract,jdbcType=INTEGER},
+      </if>
+      <if test="record.payerName != null">
+        payer_name = #{record.payerName,jdbcType=VARCHAR},
+      </if>
+      <if test="record.payeeName != null">
+        payee_name = #{record.payeeName,jdbcType=VARCHAR},
+      </if>
+      <if test="record.moneyPurpose != null">
+        money_purpose = #{record.moneyPurpose,jdbcType=VARCHAR},
+      </if>
+      <if test="record.contractPrice != null">
+        contract_price = #{record.contractPrice,jdbcType=DECIMAL},
+      </if>
+      <if test="record.payRemark != null">
+        pay_remark = #{record.payRemark,jdbcType=VARCHAR},
+      </if>
+      <if test="record.havePayMoney != null">
+        have_pay_money = #{record.havePayMoney,jdbcType=DECIMAL},
+      </if>
+      <if test="record.applyPayMoney != null">
+        apply_pay_money = #{record.applyPayMoney,jdbcType=DECIMAL},
+      </if>
+      <if test="record.applyPayMoneyUppercase != null">
+        apply_pay_money_uppercase = #{record.applyPayMoneyUppercase,jdbcType=VARCHAR},
+      </if>
+      <if test="record.fileDataIds != null">
+        file_data_ids = #{record.fileDataIds,jdbcType=VARCHAR},
+      </if>
+      <if test="record.status != null">
+        status = #{record.status,jdbcType=INTEGER},
+      </if>
+      <if test="record.createdByDept != null">
+        created_by_dept = #{record.createdByDept,jdbcType=VARCHAR},
+      </if>
+      <if test="record.createdBy != null">
+        created_by = #{record.createdBy,jdbcType=VARCHAR},
+      </if>
+      <if test="record.createdAt != null">
+        created_at = #{record.createdAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.updatedBy != null">
+        updated_by = #{record.updatedBy,jdbcType=VARCHAR},
+      </if>
+      <if test="record.updatedAt != null">
+        updated_at = #{record.updatedAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.remark != null">
+        remark = #{record.remark,jdbcType=VARCHAR},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    update apply_payment_settle
+    set id = #{record.id,jdbcType=VARCHAR},
+      flow_num = #{record.flowNum,jdbcType=VARCHAR},
+      title = #{record.title,jdbcType=VARCHAR},
+      is_no_contract = #{record.isNoContract,jdbcType=INTEGER},
+      payer_name = #{record.payerName,jdbcType=VARCHAR},
+      payee_name = #{record.payeeName,jdbcType=VARCHAR},
+      money_purpose = #{record.moneyPurpose,jdbcType=VARCHAR},
+      contract_price = #{record.contractPrice,jdbcType=DECIMAL},
+      pay_remark = #{record.payRemark,jdbcType=VARCHAR},
+      have_pay_money = #{record.havePayMoney,jdbcType=DECIMAL},
+      apply_pay_money = #{record.applyPayMoney,jdbcType=DECIMAL},
+      apply_pay_money_uppercase = #{record.applyPayMoneyUppercase,jdbcType=VARCHAR},
+      file_data_ids = #{record.fileDataIds,jdbcType=VARCHAR},
+      status = #{record.status,jdbcType=INTEGER},
+      created_by_dept = #{record.createdByDept,jdbcType=VARCHAR},
+      created_by = #{record.createdBy,jdbcType=VARCHAR},
+      created_at = #{record.createdAt,jdbcType=TIMESTAMP},
+      updated_by = #{record.updatedBy,jdbcType=VARCHAR},
+      updated_at = #{record.updatedAt,jdbcType=TIMESTAMP},
+      remark = #{record.remark,jdbcType=VARCHAR}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.idea.oa.apply.model.ApplyPaymentSettle">
+    update apply_payment_settle
+    <set>
+      <if test="flowNum != null">
+        flow_num = #{flowNum,jdbcType=VARCHAR},
+      </if>
+      <if test="title != null">
+        title = #{title,jdbcType=VARCHAR},
+      </if>
+      <if test="isNoContract != null">
+        is_no_contract = #{isNoContract,jdbcType=INTEGER},
+      </if>
+      <if test="payerName != null">
+        payer_name = #{payerName,jdbcType=VARCHAR},
+      </if>
+      <if test="payeeName != null">
+        payee_name = #{payeeName,jdbcType=VARCHAR},
+      </if>
+      <if test="moneyPurpose != null">
+        money_purpose = #{moneyPurpose,jdbcType=VARCHAR},
+      </if>
+      <if test="contractPrice != null">
+        contract_price = #{contractPrice,jdbcType=DECIMAL},
+      </if>
+      <if test="payRemark != null">
+        pay_remark = #{payRemark,jdbcType=VARCHAR},
+      </if>
+      <if test="havePayMoney != null">
+        have_pay_money = #{havePayMoney,jdbcType=DECIMAL},
+      </if>
+      <if test="applyPayMoney != null">
+        apply_pay_money = #{applyPayMoney,jdbcType=DECIMAL},
+      </if>
+      <if test="applyPayMoneyUppercase != null">
+        apply_pay_money_uppercase = #{applyPayMoneyUppercase,jdbcType=VARCHAR},
+      </if>
+      <if test="fileDataIds != null">
+        file_data_ids = #{fileDataIds,jdbcType=VARCHAR},
+      </if>
+      <if test="status != null">
+        status = #{status,jdbcType=INTEGER},
+      </if>
+      <if test="createdByDept != null">
+        created_by_dept = #{createdByDept,jdbcType=VARCHAR},
+      </if>
+      <if test="createdBy != null">
+        created_by = #{createdBy,jdbcType=VARCHAR},
+      </if>
+      <if test="createdAt != null">
+        created_at = #{createdAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updatedBy != null">
+        updated_by = #{updatedBy,jdbcType=VARCHAR},
+      </if>
+      <if test="updatedAt != null">
+        updated_at = #{updatedAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="remark != null">
+        remark = #{remark,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.idea.oa.apply.model.ApplyPaymentSettle">
+    update apply_payment_settle
+    set flow_num = #{flowNum,jdbcType=VARCHAR},
+      title = #{title,jdbcType=VARCHAR},
+      is_no_contract = #{isNoContract,jdbcType=INTEGER},
+      payer_name = #{payerName,jdbcType=VARCHAR},
+      payee_name = #{payeeName,jdbcType=VARCHAR},
+      money_purpose = #{moneyPurpose,jdbcType=VARCHAR},
+      contract_price = #{contractPrice,jdbcType=DECIMAL},
+      pay_remark = #{payRemark,jdbcType=VARCHAR},
+      have_pay_money = #{havePayMoney,jdbcType=DECIMAL},
+      apply_pay_money = #{applyPayMoney,jdbcType=DECIMAL},
+      apply_pay_money_uppercase = #{applyPayMoneyUppercase,jdbcType=VARCHAR},
+      file_data_ids = #{fileDataIds,jdbcType=VARCHAR},
+      status = #{status,jdbcType=INTEGER},
+      created_by_dept = #{createdByDept,jdbcType=VARCHAR},
+      created_by = #{createdBy,jdbcType=VARCHAR},
+      created_at = #{createdAt,jdbcType=TIMESTAMP},
+      updated_by = #{updatedBy,jdbcType=VARCHAR},
+      updated_at = #{updatedAt,jdbcType=TIMESTAMP},
+      remark = #{remark,jdbcType=VARCHAR}
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+</mapper>

pro-main/src/main/resources/processes/applyPayment.bpmn

@@ -0,0 +1,189 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions xmlns="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:activiti="http://activiti.org/bpmn" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:omgdc="http://www.omg.org/spec/DD/20100524/DC" xmlns:omgdi="http://www.omg.org/spec/DD/20100524/DI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:tns="http://www.activiti.org/test" xmlns:xsd="http://www.w3.org/2001/XMLSchema" id="m1610247356111" name="" targetNamespace="http://www.activiti.org/test">
+  <process id="applyPayment" name="付款申请" processType="None" isClosed="false" isExecutable="true">
+    <startEvent id="_2" name="发起申请" />
+    <endEvent id="_26" name="结束" />
+    <userTask id="_34" name="经办人" activiti:candidateGroups="curr_user" />
+    <sequenceFlow id="_35" sourceRef="_2" targetRef="_34" />
+    <userTask id="_3" name="部门负责人" activiti:assignee="${userId}" activiti:candidateGroups="dept_superior_1_0_1" />
+    <sequenceFlow id="_4" name="申请" sourceRef="_34" targetRef="_3">
+      <conditionExpression xsi:type="tFormalExpression">${agree=='yes'}</conditionExpression>
+    </sequenceFlow>
+    <userTask id="_5" name="财务负责人" activiti:assignee="${userId}" activiti:candidateGroups="dept_head_1_0_1" />
+    <userTask id="_6" name="分管领导" activiti:assignee="${userId}" activiti:candidateGroups="flow_fgld_1_0_1" />
+    <userTask id="_7" name="总经理" activiti:assignee="${userId}" activiti:candidateGroups="flow_sjfgld_1_0_1" />
+    <userTask id="_9" name="董事长" activiti:assignee="${userId}" activiti:candidateGroups="flow_zyld_1_0_1" />
+    <sequenceFlow id="_8" name="同意" sourceRef="_3" targetRef="_5">
+      <conditionExpression xsi:type="tFormalExpression">${agree=='yes'}</conditionExpression>
+    </sequenceFlow>
+    <sequenceFlow id="_10" name="同意" sourceRef="_5" targetRef="_6">
+      <conditionExpression xsi:type="tFormalExpression">${agree=='yes'}</conditionExpression>
+    </sequenceFlow>
+    <sequenceFlow id="_11" name="同意" sourceRef="_6" targetRef="_7">
+      <conditionExpression xsi:type="tFormalExpression">${agree=='yes'}</conditionExpression>
+    </sequenceFlow>
+    <sequenceFlow id="_12" name="同意" sourceRef="_7" targetRef="_9">
+      <conditionExpression xsi:type="tFormalExpression">${agree=='yes'}</conditionExpression>
+    </sequenceFlow>
+    <sequenceFlow id="_13" name="同意" sourceRef="_9" targetRef="_26">
+      <conditionExpression xsi:type="tFormalExpression">${agree=='yes'}</conditionExpression>
+    </sequenceFlow>
+    <sequenceFlow id="_14" name="不同意" sourceRef="_3" targetRef="_34">
+      <conditionExpression xsi:type="tFormalExpression">${agree=='no'}</conditionExpression>
+    </sequenceFlow>
+    <sequenceFlow id="_15" name="不同意" sourceRef="_5" targetRef="_34">
+      <conditionExpression xsi:type="tFormalExpression">${agree=='no'}</conditionExpression>
+    </sequenceFlow>
+    <sequenceFlow id="_16" name="不同意" sourceRef="_6" targetRef="_34">
+      <conditionExpression xsi:type="tFormalExpression">${agree=='no'}</conditionExpression>
+    </sequenceFlow>
+    <sequenceFlow id="_17" name="不同意" sourceRef="_7" targetRef="_34">
+      <conditionExpression xsi:type="tFormalExpression">${agree=='no'}</conditionExpression>
+    </sequenceFlow>
+    <sequenceFlow id="_19" name="不同意" sourceRef="_9" targetRef="_34">
+      <conditionExpression xsi:type="tFormalExpression">${agree=='no'}</conditionExpression>
+    </sequenceFlow>
+  </process>
+  <bpmndi:BPMNDiagram id="Diagram-_1" name="New Diagram" documentation="background=#FFFFFF;count=1;horizontalcount=1;orientation=0;width=842.4;height=1195.2;imageableWidth=832.4;imageableHeight=1185.2;imageableX=5.0;imageableY=5.0">
+    <bpmndi:BPMNPlane bpmnElement="applyPayment">
+      <bpmndi:BPMNShape id="Shape-_2" bpmnElement="_2">
+        <omgdc:Bounds x="45" y="115" width="32" height="32" />
+        <bpmndi:BPMNLabel>
+          <omgdc:Bounds x="0" y="0" width="32" height="32" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Shape-_26" bpmnElement="_26">
+        <omgdc:Bounds x="1180" y="510" width="32" height="32" />
+        <bpmndi:BPMNLabel>
+          <omgdc:Bounds x="0" y="0" width="32" height="32" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Shape-_34" bpmnElement="_34">
+        <omgdc:Bounds x="135" y="245" width="85" height="55" />
+        <bpmndi:BPMNLabel>
+          <omgdc:Bounds x="0" y="0" width="85" height="55" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Shape-_3" bpmnElement="_3">
+        <omgdc:Bounds x="330" y="245" width="85" height="55" />
+        <bpmndi:BPMNLabel>
+          <omgdc:Bounds x="0" y="0" width="85" height="55" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Shape-_5" bpmnElement="_5">
+        <omgdc:Bounds x="520" y="245" width="95" height="55" />
+        <bpmndi:BPMNLabel>
+          <omgdc:Bounds x="0" y="0" width="95" height="55" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Shape-_6" bpmnElement="_6">
+        <omgdc:Bounds x="730" y="245" width="100" height="55" />
+        <bpmndi:BPMNLabel>
+          <omgdc:Bounds x="0" y="0" width="100" height="55" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Shape-_7" bpmnElement="_7">
+        <omgdc:Bounds x="930" y="245" width="110" height="55" />
+        <bpmndi:BPMNLabel>
+          <omgdc:Bounds x="0" y="0" width="110" height="55" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Shape-_9" bpmnElement="_9">
+        <omgdc:Bounds x="1140" y="245" width="110" height="55" />
+        <bpmndi:BPMNLabel>
+          <omgdc:Bounds x="0" y="0" width="110" height="55" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="BPMNEdge__35" bpmnElement="_35" sourceElement="_2" targetElement="_34">
+        <omgdi:waypoint x="63" y="146.87450786638755" />
+        <omgdi:waypoint x="63" y="219" />
+        <omgdi:waypoint x="135" y="272.5" />
+        <bpmndi:BPMNLabel>
+          <omgdc:Bounds x="0" y="0" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="BPMNEdge__4" bpmnElement="_4" sourceElement="_34" targetElement="_3">
+        <omgdi:waypoint x="220" y="272.5" />
+        <omgdi:waypoint x="330" y="272.5" />
+        <bpmndi:BPMNLabel>
+          <omgdc:Bounds x="0" y="0" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="BPMNEdge__8" bpmnElement="_8" sourceElement="_3" targetElement="_5">
+        <omgdi:waypoint x="415" y="272.5" />
+        <omgdi:waypoint x="520" y="272.5" />
+        <bpmndi:BPMNLabel>
+          <omgdc:Bounds x="0" y="0" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="BPMNEdge__10" bpmnElement="_10" sourceElement="_5" targetElement="_6">
+        <omgdi:waypoint x="615" y="272.5" />
+        <omgdi:waypoint x="730" y="272.5" />
+        <bpmndi:BPMNLabel>
+          <omgdc:Bounds x="0" y="0" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="BPMNEdge__11" bpmnElement="_11" sourceElement="_6" targetElement="_7">
+        <omgdi:waypoint x="830" y="272.5" />
+        <omgdi:waypoint x="930" y="272.5" />
+        <bpmndi:BPMNLabel>
+          <omgdc:Bounds x="0" y="0" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="BPMNEdge__12" bpmnElement="_12" sourceElement="_7" targetElement="_9">
+        <omgdi:waypoint x="1040" y="272.5" />
+        <omgdi:waypoint x="1140" y="272.5" />
+        <bpmndi:BPMNLabel>
+          <omgdc:Bounds x="0" y="0" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="BPMNEdge__13" bpmnElement="_13" sourceElement="_9" targetElement="_26">
+        <omgdi:waypoint x="1196" y="300" />
+        <omgdi:waypoint x="1196" y="510" />
+        <bpmndi:BPMNLabel>
+          <omgdc:Bounds x="0" y="0" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="BPMNEdge__14" bpmnElement="_14" sourceElement="_3" targetElement="_34">
+        <omgdi:waypoint x="372.5" y="245" />
+        <omgdi:waypoint x="285" y="225" />
+        <omgdi:waypoint x="177.5" y="245" />
+        <bpmndi:BPMNLabel>
+          <omgdc:Bounds x="0" y="0" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="BPMNEdge__15" bpmnElement="_15" sourceElement="_5" targetElement="_34">
+        <omgdi:waypoint x="567.5" y="245" />
+        <omgdi:waypoint x="375" y="195" />
+        <omgdi:waypoint x="177.5" y="245" />
+        <bpmndi:BPMNLabel>
+          <omgdc:Bounds x="0" y="0" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="BPMNEdge__16" bpmnElement="_16" sourceElement="_6" targetElement="_34">
+        <omgdi:waypoint x="780" y="245" />
+        <omgdi:waypoint x="475" y="165" />
+        <omgdi:waypoint x="177.5" y="245" />
+        <bpmndi:BPMNLabel>
+          <omgdc:Bounds x="0" y="0" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="BPMNEdge__17" bpmnElement="_17" sourceElement="_7" targetElement="_34">
+        <omgdi:waypoint x="985" y="245" />
+        <omgdi:waypoint x="600" y="135" />
+        <omgdi:waypoint x="177.5" y="245" />
+        <bpmndi:BPMNLabel>
+          <omgdc:Bounds x="0" y="0" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="BPMNEdge__19" bpmnElement="_19" sourceElement="_9" targetElement="_34">
+        <omgdi:waypoint x="1195" y="245" />
+        <omgdi:waypoint x="675" y="105" />
+        <omgdi:waypoint x="177.5" y="245" />
+        <bpmndi:BPMNLabel>
+          <omgdc:Bounds x="0" y="0" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+    </bpmndi:BPMNPlane>
+  </bpmndi:BPMNDiagram>
+</definitions>