修改ocr信息

src/main/java/com/ccsens/delivery/api/HealthController.java

@@ -60,10 +60,10 @@ public class HealthController {
     @ApiImplicitParams({
     })
     @RequestMapping(value = "/ocr", method = RequestMethod.POST,produces = {"application/json;charset=UTF-8"})
-    public JsonResponse ocrHealthConclusion(@ApiParam @RequestBody @Validated List<HealthDto.HealthConclusion> params) throws Exception {
+    public JsonResponse<List<HealthVo.OcrQueryHealthVo>> ocrHealthConclusion(@ApiParam @RequestBody @Validated List<HealthDto.HealthConclusion> params) throws Exception {
         log.info("识别后上传健康相关信息:{}",params);
-        healthService.ocrHealthConclusion(params);
+        List<HealthVo.OcrQueryHealthVo> ocrQueryHealthVoList = healthService.ocrHealthConclusion(params);
-        return JsonResponse.newInstance().ok();
+        return JsonResponse.newInstance().ok(ocrQueryHealthVoList);
     }
 
     @MustLogin

src/main/java/com/ccsens/delivery/bean/dto/HealthDto.java

@@ -23,7 +23,7 @@ public class HealthDto {
     @Data
     @ApiModel("请求-提交健康相关的表单")
     public static class HealthForm{
-        @NotNull(message = "表单id不能为空")
+        @NotNull(message = "id不能为空")
         @ApiModelProperty("表单页面id")
         private Long id;
         @ApiModelProperty("类型 0健康码、1行程码、2核酸检测、3抗原检测")
@@ -35,11 +35,14 @@ public class HealthDto {
     @Data
     @ApiModel("请求-查询某天提交的健康信息")
     public static class HealthByDay{
+        @NotNull(message = "请选择图片类型")
         @ApiModelProperty("类型 0健康码、1行程码、2核酸检测、3抗原检测")
-        private byte type;
+        private Byte type;
+        @NotNull(message = "请选择起始时间")
         @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
         @ApiModelProperty("日期 yyyy-MM-dd HH:mm:ss")
         private Date startTime;
+        @NotNull(message = "请选择截止时间")
         @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
         @ApiModelProperty("日期 yyyy-MM-dd HH:mm:ss")
         private Date endTime;
@@ -50,10 +53,12 @@ public class HealthDto {
     @Data
     @ApiModel("请求-识别后的健康信息")
     public static class HealthConclusion{
+        @NotNull(message = "id不能为空")
         @ApiModelProperty("提交记录id")
         private Long id;
+        @NotNull(message = "请选择图片类型")
         @ApiModelProperty("类型 0健康码、1行程码、2核酸检测、3抗原检测")
-        private byte type;
+        private Byte type;
         @ApiModelProperty("健康码颜色 0绿色 1黄色 2红色")
         private byte colour;
         @ApiModelProperty("行程码是否带星 0否 1是")

src/main/java/com/ccsens/delivery/bean/po/RecordHealth.java

@@ -12,6 +12,8 @@ public class RecordHealth implements Serializable {
 
     private Long fileId;
 
+    private Byte ocr;
+
     private Byte colour;
 
     private Byte star;
@@ -62,6 +64,14 @@ public class RecordHealth implements Serializable {
         this.fileId = fileId;
     }
 
+    public Byte getOcr() {
+        return ocr;
+    }
+
+    public void setOcr(Byte ocr) {
+        this.ocr = ocr;
+    }
+
     public Byte getColour() {
         return colour;
     }
@@ -136,6 +146,7 @@ public class RecordHealth implements Serializable {
         sb.append(", userId=").append(userId);
         sb.append(", type=").append(type);
         sb.append(", fileId=").append(fileId);
+        sb.append(", ocr=").append(ocr);
         sb.append(", colour=").append(colour);
         sb.append(", star=").append(star);
         sb.append(", positive=").append(positive);

src/main/java/com/ccsens/delivery/bean/po/RecordHealthExample.java

@@ -345,6 +345,66 @@ public class RecordHealthExample {
             return (Criteria) this;
         }
 
+        public Criteria andOcrIsNull() {
+            addCriterion("ocr is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOcrIsNotNull() {
+            addCriterion("ocr is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOcrEqualTo(Byte value) {
+            addCriterion("ocr =", value, "ocr");
+            return (Criteria) this;
+        }
+
+        public Criteria andOcrNotEqualTo(Byte value) {
+            addCriterion("ocr <>", value, "ocr");
+            return (Criteria) this;
+        }
+
+        public Criteria andOcrGreaterThan(Byte value) {
+            addCriterion("ocr >", value, "ocr");
+            return (Criteria) this;
+        }
+
+        public Criteria andOcrGreaterThanOrEqualTo(Byte value) {
+            addCriterion("ocr >=", value, "ocr");
+            return (Criteria) this;
+        }
+
+        public Criteria andOcrLessThan(Byte value) {
+            addCriterion("ocr <", value, "ocr");
+            return (Criteria) this;
+        }
+
+        public Criteria andOcrLessThanOrEqualTo(Byte value) {
+            addCriterion("ocr <=", value, "ocr");
+            return (Criteria) this;
+        }
+
+        public Criteria andOcrIn(List<Byte> values) {
+            addCriterion("ocr in", values, "ocr");
+            return (Criteria) this;
+        }
+
+        public Criteria andOcrNotIn(List<Byte> values) {
+            addCriterion("ocr not in", values, "ocr");
+            return (Criteria) this;
+        }
+
+        public Criteria andOcrBetween(Byte value1, Byte value2) {
+            addCriterion("ocr between", value1, value2, "ocr");
+            return (Criteria) this;
+        }
+
+        public Criteria andOcrNotBetween(Byte value1, Byte value2) {
+            addCriterion("ocr not between", value1, value2, "ocr");
+            return (Criteria) this;
+        }
+
         public Criteria andColourIsNull() {
             addCriterion("colour is null");
             return (Criteria) this;

src/main/java/com/ccsens/delivery/bean/po/StuOrder.java

@@ -46,6 +46,8 @@ public class StuOrder implements Serializable {
 
     private String dormitoryName;
 
+    private Long submitTime;
+
     private static final long serialVersionUID = 1L;
 
     public Long getId() {
@@ -216,6 +218,14 @@ public class StuOrder implements Serializable {
         this.dormitoryName = dormitoryName == null ? null : dormitoryName.trim();
     }
 
+    public Long getSubmitTime() {
+        return submitTime;
+    }
+
+    public void setSubmitTime(Long submitTime) {
+        this.submitTime = submitTime;
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -243,6 +253,7 @@ public class StuOrder implements Serializable {
         sb.append(", recStatus=").append(recStatus);
         sb.append(", collegeName=").append(collegeName);
         sb.append(", dormitoryName=").append(dormitoryName);
+        sb.append(", submitTime=").append(submitTime);
         sb.append("]");
         return sb.toString();
     }

src/main/java/com/ccsens/delivery/bean/po/StuOrderExample.java

@@ -1454,6 +1454,66 @@ public class StuOrderExample {
             addCriterion("dormitory_name not between", value1, value2, "dormitoryName");
             return (Criteria) this;
         }
+
+        public Criteria andSubmitTimeIsNull() {
+            addCriterion("submit_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSubmitTimeIsNotNull() {
+            addCriterion("submit_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSubmitTimeEqualTo(Long value) {
+            addCriterion("submit_time =", value, "submitTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andSubmitTimeNotEqualTo(Long value) {
+            addCriterion("submit_time <>", value, "submitTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andSubmitTimeGreaterThan(Long value) {
+            addCriterion("submit_time >", value, "submitTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andSubmitTimeGreaterThanOrEqualTo(Long value) {
+            addCriterion("submit_time >=", value, "submitTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andSubmitTimeLessThan(Long value) {
+            addCriterion("submit_time <", value, "submitTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andSubmitTimeLessThanOrEqualTo(Long value) {
+            addCriterion("submit_time <=", value, "submitTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andSubmitTimeIn(List<Long> values) {
+            addCriterion("submit_time in", values, "submitTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andSubmitTimeNotIn(List<Long> values) {
+            addCriterion("submit_time not in", values, "submitTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andSubmitTimeBetween(Long value1, Long value2) {
+            addCriterion("submit_time between", value1, value2, "submitTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andSubmitTimeNotBetween(Long value1, Long value2) {
+            addCriterion("submit_time not between", value1, value2, "submitTime");
+            return (Criteria) this;
+        }
     }
 
     public static class Criteria extends GeneratedCriteria {

src/main/java/com/ccsens/delivery/bean/vo/HealthVo.java

@@ -89,4 +89,25 @@ public class HealthVo {
         }
 
     }
+
+
+    @Data
+    @ApiModel("返回-健康相关信息列表")
+    public static class OcrQueryHealthVo{
+        @ApiModelProperty("记录id")
+        private Long id;
+        @ApiModelProperty("是否已识别 0否 1是")
+        private Byte ocr;
+        @ApiModelProperty("图片路径")
+        private String imgPath;
+        @ApiModelProperty("提交状态 0未上报 1已上报 ")
+        private Byte status;
+        @ApiModelProperty("颜色 0绿色 1黄色 2红色")
+        private Byte colour;
+        @ApiModelProperty("是否带星 0否 1是")
+        private Byte star;
+        @ApiModelProperty("是否阳性 0阴性 1阳性")
+        private Byte positive;
+
+    }
 }

src/main/java/com/ccsens/delivery/service/HealthService.java

@@ -3,6 +3,7 @@ package com.ccsens.delivery.service;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.ccsens.delivery.bean.dto.HealthDto;
+import com.ccsens.delivery.bean.po.FileCommit;
 import com.ccsens.delivery.bean.po.RecordHealth;
 import com.ccsens.delivery.bean.po.RecordHealthExample;
 import com.ccsens.delivery.bean.po.SysMaterial;
@@ -10,6 +11,7 @@ import com.ccsens.delivery.bean.vo.HealthVo;
 import com.ccsens.delivery.bean.vo.MaterialVo;
 import com.ccsens.delivery.persist.dao.FormRecordDao;
 import com.ccsens.delivery.persist.dao.RecordHealthDao;
+import com.ccsens.delivery.persist.mapper.FileCommitMapper;
 import com.ccsens.delivery.persist.mapper.RecordHealthMapper;
 import com.ccsens.delivery.util.DeliveryCodeError;
 import com.ccsens.delivery.util.DeliveryConstant;
@@ -23,6 +25,7 @@ import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -41,6 +44,8 @@ public class HealthService implements IHealthService {
     private RecordHealthDao recordHealthDao;
     @Resource
     private FormRecordDao formRecordDao;
+    @Resource
+    private FileCommitMapper fileCommitMapper;
 
     @Override
     public void submitHealth(HealthDto.HealthForm param, Long userId) throws InterruptedException {
@@ -71,24 +76,44 @@ public class HealthService implements IHealthService {
     }
 
     @Override
-    public void ocrHealthConclusion(List<HealthDto.HealthConclusion> params) {
+    public List<HealthVo.OcrQueryHealthVo> ocrHealthConclusion(List<HealthDto.HealthConclusion> params) {
+        List<HealthVo.OcrQueryHealthVo> ocrQueryHealthVoList = new ArrayList<>();
         if(CollectionUtil.isNotEmpty(params)){
             params.forEach(param -> {
+                HealthVo.OcrQueryHealthVo ocrQueryHealthVo = new HealthVo.OcrQueryHealthVo();
+                ocrQueryHealthVo.setId(param.getId());
+
                 RecordHealth recordHealth = recordHealthMapper.selectByPrimaryKey(param.getId());
-                if(ObjectUtil.isNotNull(recordHealth) && recordHealth.getType() == param.getType()){
+                if(ObjectUtil.isNotNull(recordHealth) && recordHealth.getType().equals(param.getType())){
                     recordHealth.setColour(param.getColour());
                     recordHealth.setStar(param.getStar());
                     recordHealth.setPositive(param.getPositive());
+                    recordHealth.setOcr((byte) 1);
                     recordHealthMapper.updateByPrimaryKeySelective(recordHealth);
+
+                    ocrQueryHealthVo.setOcr(recordHealth.getOcr());
+                    ocrQueryHealthVo.setColour(recordHealth.getColour());
+                    ocrQueryHealthVo.setStar(recordHealth.getStar());
+                    ocrQueryHealthVo.setPositive(recordHealth.getPositive());
+                    FileCommit fileCommit = fileCommitMapper.selectByPrimaryKey(recordHealth.getFileId());
+                    if(ObjectUtil.isNotNull(fileCommit)){
+                        ocrQueryHealthVo.setImgPath(fileCommit.getVisitPath());
+                    }
                 }
+                ocrQueryHealthVoList.add(ocrQueryHealthVo);
             });
         }
+        return ocrQueryHealthVoList;
     }
 
     @Override
     public PageInfo<HealthVo.BackQueryHealthVo> backQueryHealth(HealthDto.BackQueryHealth param,Long userId) {
         //根据条件查询提交的信息
         PageHelper.startPage(param.getPageNum(),param.getPageSize());
+        //TODO 默认当天
+        if(ObjectUtil.isNull(param.getSubmitTime())){
+            param.setSubmitTime(System.currentTimeMillis());
+        }
         List<HealthVo.BackQueryHealthVo> queryHealthVoList = recordHealthDao.backQueryMaterialOrder(param);
         return new PageInfo<>(queryHealthVoList);
     }

src/main/java/com/ccsens/delivery/service/IHealthService.java

@@ -30,7 +30,7 @@ public interface IHealthService {
      * 上传识别后的信息
      * @param params 信息
      */
-    void ocrHealthConclusion(List<HealthDto.HealthConclusion> params);
+    List<HealthVo.OcrQueryHealthVo> ocrHealthConclusion(List<HealthDto.HealthConclusion> params);
 
     /**
      * 后台查看健康信息的提交记录

src/main/java/com/ccsens/delivery/service/StudentService.java

@@ -124,6 +124,7 @@ public class StudentService implements IStudentService {
         BeanUtil.copyProperties(param,stuOrder);
         stuOrder.setId(snowflake.nextId());
         stuOrder.setUserId(userId);
+        stuOrder.setSubmitTime(System.currentTimeMillis());
 //        String stuNum = SymmetricCryptoUtil.encrypt(DeliveryConstant.ENCRYPT_KEY,param.getStuNum());
 //        stuOrder.setStuNum(stuNum == null ? param.getStuNum() : stuNum);
 //        String phone = SymmetricCryptoUtil.encrypt(DeliveryConstant.ENCRYPT_KEY,param.getPhone());

src/main/resources/application-prod.yml

@@ -16,7 +16,7 @@ spring:
         max-idle: 10
         max-wait: -1ms
         min-idle: 0
-    password: 'areowqr!@43ef'
+    password: ''
     port: 6379
     timeout: 1000ms
 swagger:
@@ -24,5 +24,5 @@ swagger:
 
 file:
   path: /home/cloud/delivery/server/uploads/
-  domain: https://www.tall.wiki/delivery/v1.0/
+  domain: https://www.eight-hertz.com/delivery/v1.0/
-  imgDomain: https://www.tall.wiki/delivery/v1.0/uploads/
+  imgDomain: https://www.eight-hertz.com/delivery/v1.0/uploads/

src/main/resources/application.yml

@@ -1,4 +1,4 @@
 spring:
   profiles:
-    active: test
+    active: prod
     include: common

src/main/resources/mapper_dao/FormRecordDao.xml

@@ -114,7 +114,7 @@
                         #{id}
                     </foreach>
                     )
-                    AND ocr = 0
+                    -- AND ocr = 0
                     and `type` = #{types}
                     and submit_time >= #{startTime}
                     and submit_time &lt; #{endTime}
@@ -226,7 +226,7 @@
         SELECT
         h.id,
         h.type,
-        f.visit_path,
+        f.visit_path as path,
         h.ocr
         FROM
         t_record_health h,
@@ -234,8 +234,8 @@
         WHERE
         h.file_id = f.id
         and h.type = #{params.type}
-        and submit_time >= #{params.startTime}
+        and FROM_UNIXTIME(submit_time/1000,'%Y-%m-%d %H:%i:%s') >= #{params.startTime}
-        and submit_time &lt; #{params.endTime}
+        and FROM_UNIXTIME(submit_time/1000,'%Y-%m-%d %H:%i:%s') &lt; #{params.endTime}
     </select>
     <select id="queryOrganization" resultType="com.ccsens.delivery.bean.vo.CommonVo$OrganizationInfo">
         SELECT

src/main/resources/mapper_dao/RecordHealthDao.xml

@@ -71,7 +71,7 @@
                     WHERE
                         h.`type` = #{param.type}
                         <if test="param.submitTime != null">
-                            and FROM_UNIXTIME(h.submit_time / 1000,'%Y-%m-%d') = FROM_UNIXTIME(#{params.submitTime} / 1000,'%Y-%m-%d')
+                            and FROM_UNIXTIME(h.submit_time / 1000,'%Y-%m-%d') = FROM_UNIXTIME(#{param.submitTime} / 1000,'%Y-%m-%d')
                         </if>
                         AND h.rec_status = 0
                     ORDER BY h.submit_time desc

src/main/resources/mapper_dao/RecordTrailsDao.xml

@@ -99,7 +99,7 @@
     <select id="queryDetailByRecordId" resultType="com.ccsens.delivery.bean.vo.TrailsVo$TrailsDetailVo">
         SELECT
         id,
-        CONCAT(FROM_UNIXTIME(start_time / 1000,'%h:%i'),'至',FROM_UNIXTIME(end_time / 1000,'%h:%i')) as time,
+        CONCAT(FROM_UNIXTIME(start_time / 1000,'%H:%i'),'至',FROM_UNIXTIME(end_time / 1000,'%H:%i')) as time,
         trails_detail as trailsDetail,
         vehicle,
         vehicle_remark as vehicleRemark,
@@ -117,8 +117,8 @@
             and trails_detail like CONCAT('%',#{param.trailsDetail},'%')
         </if>
         <if test="param.startTime != null and param.endTime != null">
-            and FROM_UNIXTIME(start_time / 1000,'%h:%i') &lt;= #{param.endTime}
+            and FROM_UNIXTIME(start_time / 1000,'%H:%i') &lt;= #{param.endTime}
-            and FROM_UNIXTIME(end_time / 1000,'%h:%i') >= #{param.startTime}
+            and FROM_UNIXTIME(end_time / 1000,'%H:%i') >= #{param.startTime}
         </if>
 
     </select>

src/main/resources/mapper_raw/RecordHealthMapper.xml

@@ -6,6 +6,7 @@
     <result column="user_id" jdbcType="BIGINT" property="userId" />
     <result column="type" jdbcType="TINYINT" property="type" />
     <result column="file_id" jdbcType="BIGINT" property="fileId" />
+    <result column="ocr" jdbcType="TINYINT" property="ocr" />
     <result column="colour" jdbcType="TINYINT" property="colour" />
     <result column="star" jdbcType="TINYINT" property="star" />
     <result column="positive" jdbcType="TINYINT" property="positive" />
@@ -74,7 +75,7 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    id, user_id, type, file_id, colour, star, positive, submit_time, operator, created_at, 
+    id, user_id, type, file_id, ocr, colour, star, positive, submit_time, operator, created_at, 
     updated_at, rec_status
   </sql>
   <select id="selectByExample" parameterType="com.ccsens.delivery.bean.po.RecordHealthExample" resultMap="BaseResultMap">
@@ -109,15 +110,15 @@
   </delete>
   <insert id="insert" parameterType="com.ccsens.delivery.bean.po.RecordHealth">
     insert into t_record_health (id, user_id, type, 
-      file_id, colour, star, 
+      file_id, ocr, colour, 
-      positive, submit_time, operator, 
+      star, positive, submit_time, 
-      created_at, updated_at, rec_status
+      operator, created_at, updated_at, 
-      )
+      rec_status)
     values (#{id,jdbcType=BIGINT}, #{userId,jdbcType=BIGINT}, #{type,jdbcType=TINYINT}, 
-      #{fileId,jdbcType=BIGINT}, #{colour,jdbcType=TINYINT}, #{star,jdbcType=TINYINT}, 
+      #{fileId,jdbcType=BIGINT}, #{ocr,jdbcType=TINYINT}, #{colour,jdbcType=TINYINT}, 
-      #{positive,jdbcType=TINYINT}, #{submitTime,jdbcType=BIGINT}, #{operator,jdbcType=BIGINT}, 
+      #{star,jdbcType=TINYINT}, #{positive,jdbcType=TINYINT}, #{submitTime,jdbcType=BIGINT}, 
-      #{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP}, #{recStatus,jdbcType=TINYINT}
+      #{operator,jdbcType=BIGINT}, #{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP}, 
-      )
+      #{recStatus,jdbcType=TINYINT})
   </insert>
   <insert id="insertSelective" parameterType="com.ccsens.delivery.bean.po.RecordHealth">
     insert into t_record_health
@@ -134,6 +135,9 @@
       <if test="fileId != null">
         file_id,
       </if>
+      <if test="ocr != null">
+        ocr,
+      </if>
       <if test="colour != null">
         colour,
       </if>
@@ -172,6 +176,9 @@
       <if test="fileId != null">
         #{fileId,jdbcType=BIGINT},
       </if>
+      <if test="ocr != null">
+        #{ocr,jdbcType=TINYINT},
+      </if>
       <if test="colour != null">
         #{colour,jdbcType=TINYINT},
       </if>
@@ -219,6 +226,9 @@
       <if test="record.fileId != null">
         file_id = #{record.fileId,jdbcType=BIGINT},
       </if>
+      <if test="record.ocr != null">
+        ocr = #{record.ocr,jdbcType=TINYINT},
+      </if>
       <if test="record.colour != null">
         colour = #{record.colour,jdbcType=TINYINT},
       </if>
@@ -254,6 +264,7 @@
       user_id = #{record.userId,jdbcType=BIGINT},
       type = #{record.type,jdbcType=TINYINT},
       file_id = #{record.fileId,jdbcType=BIGINT},
+      ocr = #{record.ocr,jdbcType=TINYINT},
       colour = #{record.colour,jdbcType=TINYINT},
       star = #{record.star,jdbcType=TINYINT},
       positive = #{record.positive,jdbcType=TINYINT},
@@ -278,6 +289,9 @@
       <if test="fileId != null">
         file_id = #{fileId,jdbcType=BIGINT},
       </if>
+      <if test="ocr != null">
+        ocr = #{ocr,jdbcType=TINYINT},
+      </if>
       <if test="colour != null">
         colour = #{colour,jdbcType=TINYINT},
       </if>
@@ -310,6 +324,7 @@
     set user_id = #{userId,jdbcType=BIGINT},
       type = #{type,jdbcType=TINYINT},
       file_id = #{fileId,jdbcType=BIGINT},
+      ocr = #{ocr,jdbcType=TINYINT},
       colour = #{colour,jdbcType=TINYINT},
       star = #{star,jdbcType=TINYINT},
       positive = #{positive,jdbcType=TINYINT},

src/main/resources/mapper_raw/StuOrderMapper.xml

@@ -23,6 +23,7 @@
     <result column="rec_status" jdbcType="TINYINT" property="recStatus" />
     <result column="college_name" jdbcType="VARCHAR" property="collegeName" />
     <result column="dormitory_name" jdbcType="VARCHAR" property="dormitoryName" />
+    <result column="submit_time" jdbcType="BIGINT" property="submitTime" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <where>
@@ -85,7 +86,7 @@
   <sql id="Base_Column_List">
     id, user_id, name, stu_num, phone, id_card, college_id, dormitory_id, address, symptom, 
     broken, remark, plan_time, real_time, status, operator, created_at, updated_at, rec_status, 
-    college_name, dormitory_name
+    college_name, dormitory_name, submit_time
   </sql>
   <select id="selectByExample" parameterType="com.ccsens.delivery.bean.po.StuOrderExample" resultMap="BaseResultMap">
     select
@@ -124,16 +125,16 @@
       symptom, broken, remark, 
       plan_time, real_time, status, 
       operator, created_at, updated_at, 
-      rec_status, college_name, dormitory_name
+      rec_status, college_name, dormitory_name, 
-      )
+      submit_time)
     values (#{id,jdbcType=BIGINT}, #{userId,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, 
       #{stuNum,jdbcType=VARCHAR}, #{phone,jdbcType=VARCHAR}, #{idCard,jdbcType=VARCHAR}, 
       #{collegeId,jdbcType=BIGINT}, #{dormitoryId,jdbcType=BIGINT}, #{address,jdbcType=VARCHAR}, 
       #{symptom,jdbcType=VARCHAR}, #{broken,jdbcType=TINYINT}, #{remark,jdbcType=VARCHAR}, 
       #{planTime,jdbcType=BIGINT}, #{realTime,jdbcType=BIGINT}, #{status,jdbcType=TINYINT}, 
       #{operator,jdbcType=BIGINT}, #{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP}, 
-      #{recStatus,jdbcType=TINYINT}, #{collegeName,jdbcType=VARCHAR}, #{dormitoryName,jdbcType=VARCHAR}
+      #{recStatus,jdbcType=TINYINT}, #{collegeName,jdbcType=VARCHAR}, #{dormitoryName,jdbcType=VARCHAR}, 
-      )
+      #{submitTime,jdbcType=BIGINT})
   </insert>
   <insert id="insertSelective" parameterType="com.ccsens.delivery.bean.po.StuOrder">
     insert into t_stu_order
@@ -201,6 +202,9 @@
       <if test="dormitoryName != null">
         dormitory_name,
       </if>
+      <if test="submitTime != null">
+        submit_time,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -266,6 +270,9 @@
       <if test="dormitoryName != null">
         #{dormitoryName,jdbcType=VARCHAR},
       </if>
+      <if test="submitTime != null">
+        #{submitTime,jdbcType=BIGINT},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.ccsens.delivery.bean.po.StuOrderExample" resultType="java.lang.Long">
@@ -340,6 +347,9 @@
       <if test="record.dormitoryName != null">
         dormitory_name = #{record.dormitoryName,jdbcType=VARCHAR},
       </if>
+      <if test="record.submitTime != null">
+        submit_time = #{record.submitTime,jdbcType=BIGINT},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -367,7 +377,8 @@
       updated_at = #{record.updatedAt,jdbcType=TIMESTAMP},
       rec_status = #{record.recStatus,jdbcType=TINYINT},
       college_name = #{record.collegeName,jdbcType=VARCHAR},
-      dormitory_name = #{record.dormitoryName,jdbcType=VARCHAR}
+      dormitory_name = #{record.dormitoryName,jdbcType=VARCHAR},
+      submit_time = #{record.submitTime,jdbcType=BIGINT}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -435,6 +446,9 @@
       <if test="dormitoryName != null">
         dormitory_name = #{dormitoryName,jdbcType=VARCHAR},
       </if>
+      <if test="submitTime != null">
+        submit_time = #{submitTime,jdbcType=BIGINT},
+      </if>
     </set>
     where id = #{id,jdbcType=BIGINT}
   </update>
@@ -459,7 +473,8 @@
       updated_at = #{updatedAt,jdbcType=TIMESTAMP},
       rec_status = #{recStatus,jdbcType=TINYINT},
       college_name = #{collegeName,jdbcType=VARCHAR},
-      dormitory_name = #{dormitoryName,jdbcType=VARCHAR}
+      dormitory_name = #{dormitoryName,jdbcType=VARCHAR},
+      submit_time = #{submitTime,jdbcType=BIGINT}
     where id = #{id,jdbcType=BIGINT}
   </update>
 </mapper>

src/main/resources/mbg.xml

@@ -61,8 +61,8 @@
 <!--        <table tableName="t_sys_area" domainObjectName="SysArea"/>-->
 <!--        <table tableName="t_stu_order" domainObjectName="StuOrder"/>-->
 <!--        <table tableName="t_stu_order_item" domainObjectName="StuOrderItem"/>-->
-        <table tableName="t_sys_user_info" domainObjectName="SysUserInfo"/>
+<!--        <table tableName="t_sys_user_info" domainObjectName="SysUserInfo"/>-->
-<!--        <table tableName="t_record_health" domainObjectName="RecordHealth"/>-->
+        <table tableName="t_record_health" domainObjectName="RecordHealth"/>
 <!--        <table tableName="t_record_trails" domainObjectName="RecordTrails"/>-->
 <!--        <table tableName="t_record_trails_detail" domainObjectName="RecordTrailsDetail"/>-->
 <!--        <table tableName="t_record_material" domainObjectName="RecordMaterial"/>-->