Merge branch 'develop' of 120.24.24.239:8timerv2/8timerapiv200 into wdz

pom.xml

@@ -102,11 +102,11 @@
 		</dependency>
 		</dependency>
 
 
 		<!-- optional这个需要为 true 热部署才有效 -->
 		<!-- optional这个需要为 true 热部署才有效 -->
-		<dependency>
+		<!-- <dependency>
 			<groupId>org.springframework.boot</groupId>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-devtools</artifactId>
 			<artifactId>spring-boot-devtools</artifactId>
 			<optional>true</optional>
 			<optional>true</optional>
-		</dependency>
+		</dependency> -->
 
 
 		<!-- swagger2 -->
 		<!-- swagger2 -->
 		<dependency>
 		<dependency>
@@ -272,7 +272,7 @@
 			<version>1.1.10</version>
 			<version>1.1.10</version>
 		</dependency>
 		</dependency>
 
 
-		<!-- https://mvnrepository.com/artifact/com.baomidou/mybatis-plus-boot-starter -->
+		<!-- mybatis-plus -->
 		<dependency>
 		<dependency>
 			<groupId>com.baomidou</groupId>
 			<groupId>com.baomidou</groupId>
 			<artifactId>mybatis-plus-boot-starter</artifactId>
 			<artifactId>mybatis-plus-boot-starter</artifactId>

src/main/java/cn/timer/api/bean/spmk/SpmkApproveExecuteRecord.java

 package cn.timer.api.bean.spmk;
 package cn.timer.api.bean.spmk;
 
 
 import java.util.Date;
 import java.util.Date;
+import java.util.List;
 
 
 import javax.persistence.GeneratedValue;
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
 import javax.persistence.Id;
@@ -57,4 +58,6 @@ public class SpmkApproveExecuteRecord extends Model<SpmkApproveExecuteRecord> {
 	@ApiModelProperty(value = "创建时间 ", example = "创建时间")
 	@ApiModelProperty(value = "创建时间 ", example = "创建时间")
 	private Date createTime;
 	private Date createTime;
 
 
+	private List<SpmkExecutor> spmkExecutors;
+	
 }
 }
\ No newline at end of file

src/main/java/cn/timer/api/bean/spmk/SpmkApproveSummary.java

@@ -64,7 +64,7 @@ public class SpmkApproveSummary extends Model<SpmkApproveSummary> {
 	private String approveName;
 	private String approveName;
 
 
 	@TableField(fill = FieldFill.INSERT)
 	@TableField(fill = FieldFill.INSERT)
-	@ApiModelProperty(value = "状态 0审批中 1审批撤销 2审批拒绝 3审批通过/审批完成", example = "101")
+	@ApiModelProperty(value = "状态 0审批中 1审批撤销  2审批通过/审批完成 3审批拒绝", example = "101")
 	private Integer sts;
 	private Integer sts;
 
 
 	@ApiModelProperty(value = "当前审批人 ", example = "当前审批人")
 	@ApiModelProperty(value = "当前审批人 ", example = "当前审批人")

src/main/java/cn/timer/api/config/autofill/MyMetaObjectHandler.java

@@ -18,7 +18,11 @@ public class MyMetaObjectHandler implements MetaObjectHandler {
 		log.info("start insert fill ....");
 		log.info("start insert fill ....");
 		Date date = new Date();
 		Date date = new Date();
 		this.strictInsertFill(metaObject, "createTime", Date.class, date); // 起始版本 3.3.0(推荐使用)
 		this.strictInsertFill(metaObject, "createTime", Date.class, date); // 起始版本 3.3.0(推荐使用)
-		this.strictInsertFill(metaObject, "sts", Integer.class, 0); // 起始版本 3.3.0(推荐使用)
+		this.strictInsertFill(metaObject, "lrsjTime", Date.class, date);
+		this.strictInsertFill(metaObject, "regTime", Date.class, date);
+		this.strictInsertFill(metaObject, "registerTime", Date.class, date);
+		this.strictInsertFill(metaObject, "addtime", Date.class, date);
+		this.strictInsertFill(metaObject, "sts", int.class, 0); // 起始版本 3.3.0(推荐使用)
 
 
 	}
 	}
 
 
@@ -27,6 +31,7 @@ public class MyMetaObjectHandler implements MetaObjectHandler {
 		log.info("start update fill ....");
 		log.info("start update fill ....");
 		Date date = new Date();
 		Date date = new Date();
 		this.strictUpdateFill(metaObject, "updateTime", Date.class, date); // 起始版本 3.3.0(推荐使用)
 		this.strictUpdateFill(metaObject, "updateTime", Date.class, date); // 起始版本 3.3.0(推荐使用)
+		this.strictUpdateFill(metaObject, "modifyTime", Date.class, date);
 	}
 	}
 	
 	
 }
 }

src/main/java/cn/timer/api/dto/spmk/ApprovingDto.java

+package cn.timer.api.dto.spmk;
+
+import java.util.Date;
+import java.util.List;
+
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import cn.hutool.json.JSONObject;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class ApprovingDto {
+	
+	@ApiModelProperty(value = "审批汇总id", example = "2")
+	private Integer asId;
+	
+	@ApiModelProperty(value = "审批执行记录id", example = "10")
+	private Integer executeRecordId;
+	
+	@ApiModelProperty(value = "执行人记录id", example = "10")
+	private Integer executorId;
+	
+	@ApiModelProperty(value = "意见", example = "MMMMMMMM")
+	private String opinion;
+	
+	@ApiModelProperty(value = "状态 2同意 3拒绝", example = "2")
+	private Integer sts;
+	
+}

src/main/java/cn/timer/api/dto/spmk/Condition.java

 package cn.timer.api.dto.spmk;
 package cn.timer.api.dto.spmk;
 
 
 import java.io.Serializable;
 import java.io.Serializable;
+import java.util.List;
 
 
 import lombok.AllArgsConstructor;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Builder;
@@ -18,10 +19,14 @@ public class Condition implements Serializable {
 	 */
 	 */
 	private static final long serialVersionUID = 1L;
 	private static final long serialVersionUID = 1L;
 
 
+	private String className;
+	
+	private String displayName;
+	
 	private String key;
 	private String key;
 
 
 	private String format;
 	private String format;
 	
 	
-	private String value;
+	private List<String> values;
 
 
 }
 }

src/main/java/cn/timer/api/dto/spmk/Router.java

@@ -55,4 +55,9 @@ public class Router extends JSONSupport implements Serializable{
 	 */
 	 */
 	private List<Router> children;
 	private List<Router> children;
 	
 	
+	/**
+	 * 名称
+	 */
+	private String name;
+	
 }
 }

src/main/java/cn/timer/api/dto/spmk/SpmkApprovalGDto.java

 package cn.timer.api.dto.spmk;
 package cn.timer.api.dto.spmk;
 
 
+import java.io.Serializable;
+import java.util.Date;
 import java.util.List;
 import java.util.List;
 
 
-import javax.persistence.Entity;
-
-import cn.timer.api.bean.spmk.SpmkApprovalG;
+import cn.hutool.json.JSONObject;
 import cn.timer.api.bean.spmk.SpmkCustomApproval;
 import cn.timer.api.bean.spmk.SpmkCustomApproval;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.AllArgsConstructor;
+import lombok.Builder;
 import lombok.Data;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.NoArgsConstructor;
 
 
 @Data
 @Data
+@Builder
 @NoArgsConstructor
 @NoArgsConstructor
 @AllArgsConstructor
 @AllArgsConstructor
-public class SpmkApprovalGDto extends SpmkApprovalG {
+public class SpmkApprovalGDto implements Serializable {
 
 
 	/**
 	/**
 	 * 
 	 * 
 	 */
 	 */
 	private static final long serialVersionUID = 1L;
 	private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty(value = "编号 编号", example = "101")
+	private Integer id;
+
+	@ApiModelProperty(value = "企业组织代码 企业组织代码", example = "101")
+	private Integer orgCode;
+
+	@ApiModelProperty(value = "组名 ", example = "组名")
+	private String name;
+
+	@ApiModelProperty(value = "排序 排序", example = "101")
+	private Integer ranks;
+
+	@ApiModelProperty(value = "是否可编辑 0是 1否", example = "101")
+	private Integer isEditable;
+
 	private List<SpmkCustomApproval> spmkCustomApprovals;
 	private List<SpmkCustomApproval> spmkCustomApprovals;
 
 
 }
 }

src/main/java/cn/timer/api/dto/spmk/SpmkApproveSummaryDto.java

 package cn.timer.api.dto.spmk;
 package cn.timer.api.dto.spmk;
 
 
 import java.util.Date;
 import java.util.Date;
+import java.util.List;
 
 
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableField;
@@ -38,7 +39,7 @@ public class SpmkApproveSummaryDto{
 	private JSONObject requestData;
 	private JSONObject requestData;
 
 
 	@ApiModelProperty(value = "审批表单 ", example = "审批表单")
 	@ApiModelProperty(value = "审批表单 ", example = "审批表单")
-	private JSONObject froms;
+	private List<JSONObject> froms;
 
 
 	@ApiModelProperty(value = "审批流程 ", example = "审批流程")
 	@ApiModelProperty(value = "审批流程 ", example = "审批流程")
 	private Router router;
 	private Router router;

src/main/java/cn/timer/api/dto/spmk/SpmkCustomApprovalDto.java

@@ -54,7 +54,7 @@ public class SpmkCustomApprovalDto {
 	private Integer assoType;
 	private Integer assoType;
 
 
 	@ApiModelProperty(value = "审批表单 ", example = "审批表单")
 	@ApiModelProperty(value = "审批表单 ", example = "审批表单")
-	private JSONObject froms;
+	private List<JSONObject> froms;
 
 
 	@ApiModelProperty(value = "审批流程 ", example = "审批流程")
 	@ApiModelProperty(value = "审批流程 ", example = "审批流程")
 	private Router router;
 	private Router router;
@@ -62,5 +62,4 @@ public class SpmkCustomApprovalDto {
 	@ApiModelProperty(value = "可见发起人配置 ", example = "可见发起人配置 ")
 	@ApiModelProperty(value = "可见发起人配置 ", example = "可见发起人配置 ")
 	private List<SpmkInitiatorConfig> initiatorConfigs;
 	private List<SpmkInitiatorConfig> initiatorConfigs;
 
 
-
 }
 }

src/main/resources/application-dev.yml

@@ -141,7 +141,7 @@ pagehelper:
 logging:
 logging:
   level:
   level:
     root: info
     root: info
-    cn.timer.api.dao: error
+    cn.timer.api.dao: debug
   pattern:
   pattern:
     console: '--%p--%m%n'
     console: '--%p--%m%n'
     
     

src/main/resources/mapping/spmk/SpmkApprovalGMapper.xml

@@ -60,9 +60,9 @@
                 b.is_opinion SpmkCustomApproval_is_opinion,
                 b.is_opinion SpmkCustomApproval_is_opinion,
                 b.update_time SpmkCustomApproval_update_time,
                 b.update_time SpmkCustomApproval_update_time,
                 b.create_time SpmkCustomApproval_create_time,
                 b.create_time SpmkCustomApproval_create_time,
-                b.asso_type SpmkCustomApproval_asso_type,
+                b.asso_type SpmkCustomApproval_asso_type<!-- ,
                 b.froms SpmkCustomApproval_froms,
                 b.froms SpmkCustomApproval_froms,
-                b.router SpmkCustomApproval_router
+                b.router SpmkCustomApproval_router -->
     </sql>      
     </sql>      
     
     
     <select id="selectListAgInCa" resultMap="BaseResultMapDto">
     <select id="selectListAgInCa" resultMap="BaseResultMapDto">
@@ -73,16 +73,16 @@
          
          
         LEFT JOIN spmk_custom_approval b ON a.id = b.approval_g_id
         LEFT JOIN spmk_custom_approval b ON a.id = b.approval_g_id
         
         
-        WHERE b.org_code = #{org_code} AND b.id in 
-        (
-        	SELECT custom_approval_id FROM spmk_initiator_config WHERE emp_num = #{emp_num} GROUP BY custom_approval_id
-        )
+        WHERE a.org_code = #{org_code}  
+<!--        AND b.id IN (
+        	SELECT custom_approval_id FROM spmk_initiator_config WHERE asso_id = #{emp_num} AND type = 1 GROUP BY custom_approval_id
+        ) -->
         ORDER BY a.ranks, b.ranks
         ORDER BY a.ranks, b.ranks
     </select>
     </select>
     
     
     <update id="updateListRandsById" parameterType="list">
     <update id="updateListRandsById" parameterType="list">
         <foreach item="item" index="index" collection="list" open="" separator=";" close="">
         <foreach item="item" index="index" collection="list" open="" separator=";" close="">
-	        		UPDATE spmk_approval_template_g
+	        		UPDATE spmk_approval_g
 			        <set>
 			        <set>
 			                    <if test ='null != item.ranks'>ranks = #{item.ranks},</if>
 			                    <if test ='null != item.ranks'>ranks = #{item.ranks},</if>
 			        </set>
 			        </set>