日常检查-01

pom.xml

@@ -14,7 +14,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.0.2.RELEASE</version>
+		<version>2.0.4.RELEASE</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 
@@ -33,7 +33,7 @@
 		<dependency>
 			<groupId>org.mybatis.spring.boot</groupId>
 			<artifactId>mybatis-spring-boot-starter</artifactId>
-			<version>1.3.1</version>
+			<version>1.3.2</version>
 		</dependency>
 		<!-- 引入spring boot自带的pagehelper插件 -->
 		<dependency>
@@ -43,17 +43,13 @@
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-starter-netflix-eureka-server</artifactId>
+			<artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-starter-config</artifactId>
 		</dependency>
 		<dependency>
-        	<groupId>org.springframework.cloud</groupId>
-        	<artifactId>spring-cloud-starter-openfeign</artifactId>
-        </dependency>
-		<dependency>
 			<groupId>org.apache.commons</groupId>
 			<artifactId>commons-lang3</artifactId>
 			<version>3.7</version>
@@ -170,7 +166,7 @@
 		<dependency>
 		    <groupId>com.alibaba</groupId>
 		    <artifactId>fastjson</artifactId>
-		    <version>1.2.4</version>
+		    <version>1.2.41</version>
 		</dependency>
 		<!-- lombok-->
         <dependency>

src/main/java/com/chinaitop/depot/storage/mapper/StorageDailycheckMapper.xml

@@ -35,6 +35,7 @@
     <result column="lsmbqk" property="lsmbqk" jdbcType="INTEGER" />
     <result column="cfywxl" property="cfywxl" jdbcType="INTEGER" />
     <result column="sffc" property="sffc" jdbcType="INTEGER" />
+    <result column="commit_time" property="commitTime" jdbcType="INTEGER" />
   </resultMap>
   <sql id="Example_Where_Clause" >
     <where >
@@ -98,7 +99,7 @@
     id, house_id, warehouse_id, org_id, sub_type, check_time, checker, pests_position,
     pests_density, pests_species, rain_check, ratfinch_check, other_check, find_question,
     flag_type, rcdoor, rcwindow, rclamp, rchygiene, rccorridor, bgy, cyry,
-    tqqk, lw, cw, qw, cns, cws, sfjl, lsmbqk, cfywxl, sffc
+    tqqk, lw, cw, qw, cns, cws, sfjl, lsmbqk, cfywxl, sffc, commit_time
   </sql>
   <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.chinaitop.depot.storage.model.StorageDailycheckExample" >
     select
@@ -137,7 +138,7 @@
       pests_species, rain_check, ratfinch_check,
       other_check, find_question, flag_type,
       rcdoor, rcwindow,rclamp, rchygiene, rccorridor, bgy, cyry,
-      tqqk, lw, cw, qw, cns, cws, sfjl, lsmbqk, cfywxl, sffc
+      tqqk, lw, cw, qw, cns, cws, sfjl, lsmbqk, cfywxl, sffc, commit_time
       )
     values (#{id,jdbcType=INTEGER}, #{houseId,jdbcType=INTEGER}, #{warehouseId,jdbcType=INTEGER},
       #{orgId,jdbcType=INTEGER}, #{subType,jdbcType=INTEGER}, #{checkTime,jdbcType=TIMESTAMP},
@@ -148,7 +149,7 @@
       #{bgy,jdbcType=VARCHAR}, #{cyry,jdbcType=VARCHAR}, #{tqqk,jdbcType=VARCHAR}, #{lw,jdbcType=DECIMAL},
       #{cw,jdbcType=VARCHAR}, #{qw,jdbcType=VARCHAR}, #{cns,jdbcType=VARCHAR}, #{cws,jdbcType=VARCHAR},
       #{sfjl,jdbcType=INTEGER}, #{lsmbqk,jdbcType=INTEGER}, #{cfywxl,jdbcType=INTEGER},
-      #{sffc,jdbcType=INTEGER})
+      #{sffc,jdbcType=INTEGER}, #{commitTime,jdbcType=TIMESTAMP})
   </insert>
   <insert id="insertSelective" parameterType="com.chinaitop.depot.storage.model.StorageDailycheck" >
     insert into storage_dailycheck
@@ -250,6 +251,9 @@
       <if test="sffc != null" >
         sffc,
       </if>
+      <if test="commitTime != null" >
+        commit_time,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides="," >
       SEQ_STORAGE_DAILYCHECK.nextVal,
@@ -349,6 +353,9 @@
       <if test="sffc != null" >
         #{sffc,jdbcType=INTEGER},
       </if>
+      <if test="commitTime != null" >
+        #{commitTime,jdbcType=TIMESTAMP},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.chinaitop.depot.storage.model.StorageDailycheckExample" resultType="java.lang.Integer" >
@@ -459,6 +466,9 @@
       <if test="record.sffc != null" >
         sffc = #{record.sffc,jdbcType=INTEGER},
       </if>
+      <if test="record.commitTime != null" >
+        commit_time = #{record.commitTime,jdbcType=TIMESTAMP},
+      </if>
     </set>
     <if test="_parameter != null" >
       <include refid="Update_By_Example_Where_Clause" />
@@ -497,7 +507,8 @@
     sfjl = #{record.sfjl,jdbcType=INTEGER},
     lsmbqk = #{record.lsmbqk,jdbcType=INTEGER},
     cfywxl = #{record.cfywxl,jdbcType=INTEGER},
-    sffc = #{record.sffc,jdbcType=INTEGER}
+    sffc = #{record.sffc,jdbcType=INTEGER},
+    commit_time = #{record.commitTime,jdbcType=TIMESTAMP}
     <if test="_parameter != null" >
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -601,6 +612,9 @@
       <if test="sffc != null" >
         sffc = #{sffc,jdbcType=INTEGER},
       </if>
+      <if test="commitTime != null" >
+        commit_time = #{commitTime,jdbcType=TIMESTAMP},
+      </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
@@ -636,7 +650,8 @@
       sfjl = #{sfjl,jdbcType=INTEGER},
       lsmbqk = #{lsmbqk,jdbcType=INTEGER},
       cfywxl = #{cfywxl,jdbcType=INTEGER},
-      sffc = #{sffc,jdbcType=INTEGER}
+      sffc = #{sffc,jdbcType=INTEGER},
+      commit_time = #{commitTime,jdbcType=TIMESTAMP}
     where id = #{id,jdbcType=INTEGER}
   </update>
 

src/main/java/com/chinaitop/depot/storage/model/StorageDailycheck.java

@@ -18,7 +18,9 @@ public class StorageDailycheck {
 
     private String bgy;
 
-    private String cyry;
+    private String cyry; // 参与人员(提交人)
+
+    private Date commitTime; // 参与人员(提交人)
 
     private String tqqk;
 
@@ -455,4 +457,12 @@ public class StorageDailycheck {
     public void setSffc(Integer sffc) {
         this.sffc = sffc;
     }
+
+    public Date getCommitTime() {
+        return commitTime;
+    }
+
+    public void setCommitTime(Date commitTime) {
+        this.commitTime = commitTime;
+    }
 }

src/main/java/com/chinaitop/depot/storage/model/StorageDailycheckExample.java

@@ -2287,6 +2287,66 @@ public class StorageDailycheckExample {
             addCriterion("sffc not between", value1, value2, "sffc");
             return (Criteria) this;
         }
+
+        public Criteria andCommitTimeIsNull() {
+            addCriterion("commit_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCommitTimeIsNotNull() {
+            addCriterion("commit_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCommitTimeEqualTo(Date value) {
+            addCriterion("commit_time =", value, "commitTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCommitTimeNotEqualTo(Date value) {
+            addCriterion("commit_time <>", value, "commitTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCommitTimeGreaterThan(Date value) {
+            addCriterion("commit_time >", value, "commitTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCommitTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("commit_time >=", value, "commitTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCommitTimeLessThan(Date value) {
+            addCriterion("commit_time <", value, "commitTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCommitTimeLessThanOrEqualTo(Date value) {
+            addCriterion("commit_time <=", value, "commitTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCommitTimeIn(List<Date> values) {
+            addCriterion("commit_time in", values, "commitTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCommitTimeNotIn(List<Date> values) {
+            addCriterion("commit_time not in", values, "commitTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCommitTimeBetween(Date value1, Date value2) {
+            addCriterion("commit_time between", value1, value2, "commitTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCommitTimeNotBetween(Date value1, Date value2) {
+            addCriterion("commit_time not between", value1, value2, "commitTime");
+            return (Criteria) this;
+        }
     }
 
     /**