conflict

health/src/main/java/com/ccsens/health/api/AbnormalController.java

@@ -42,7 +42,7 @@ public class AbnormalController {
     @RequestMapping(value = "add", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
     public JsonResponse addAbnormal(@ApiParam @Validated @RequestBody QueryDto<AbnormalDto.AddAbnormal> params) throws Exception {
         log.info("异常人员添加：{}",params);
-        abnormalService.AddAbnormal(params);
+        abnormalService.addAbnormal(params);
         return JsonResponse.newInstance().ok();
     }
 
@@ -52,8 +52,8 @@ public class AbnormalController {
     public JsonResponse<List<AbnormalVo.AbnormalStatisticsVo>> abnormalStatistics(
             @ApiParam @Validated @RequestBody QueryDto<AbnormalDto.AbnormalStatisticsDto> params) throws Exception {
         log.info("异常人员添加：{}",params);
-        List<AbnormalVo.AbnormalStatisticsVo> abnormalStatisticsVoList = abnormalService.AbnormalStatistics(params);
+        List<AbnormalVo.AbnormalStatisticsVo> abnormalStatisticsVoList = abnormalService.abnormalStatistics(params);
-        return JsonResponse.newInstance().ok();
+        return JsonResponse.newInstance().ok(abnormalStatisticsVoList);
     }
 
     @MustLogin

health/src/main/java/com/ccsens/health/bean/po/JourneyAbnormal.java

@@ -14,6 +14,8 @@ public class JourneyAbnormal implements Serializable {
 
     private Long endTime;
 
+    private String description;
+
     private Date createdAt;
 
     private Date updatedAt;
@@ -62,6 +64,14 @@ public class JourneyAbnormal implements Serializable {
         this.endTime = endTime;
     }
 
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description == null ? null : description.trim();
+    }
+
     public Date getCreatedAt() {
         return createdAt;
     }
@@ -97,6 +107,7 @@ public class JourneyAbnormal implements Serializable {
         sb.append(", carNo=").append(carNo);
         sb.append(", startTime=").append(startTime);
         sb.append(", endTime=").append(endTime);
+        sb.append(", description=").append(description);
         sb.append(", createdAt=").append(createdAt);
         sb.append(", updatedAt=").append(updatedAt);
         sb.append(", recStatus=").append(recStatus);

health/src/main/java/com/ccsens/health/bean/po/JourneyAbnormalExample.java

@@ -425,6 +425,76 @@ public class JourneyAbnormalExample {
             return (Criteria) this;
         }
 
+        public Criteria andDescriptionIsNull() {
+            addCriterion("description is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDescriptionIsNotNull() {
+            addCriterion("description is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDescriptionEqualTo(String value) {
+            addCriterion("description =", value, "description");
+            return (Criteria) this;
+        }
+
+        public Criteria andDescriptionNotEqualTo(String value) {
+            addCriterion("description <>", value, "description");
+            return (Criteria) this;
+        }
+
+        public Criteria andDescriptionGreaterThan(String value) {
+            addCriterion("description >", value, "description");
+            return (Criteria) this;
+        }
+
+        public Criteria andDescriptionGreaterThanOrEqualTo(String value) {
+            addCriterion("description >=", value, "description");
+            return (Criteria) this;
+        }
+
+        public Criteria andDescriptionLessThan(String value) {
+            addCriterion("description <", value, "description");
+            return (Criteria) this;
+        }
+
+        public Criteria andDescriptionLessThanOrEqualTo(String value) {
+            addCriterion("description <=", value, "description");
+            return (Criteria) this;
+        }
+
+        public Criteria andDescriptionLike(String value) {
+            addCriterion("description like", value, "description");
+            return (Criteria) this;
+        }
+
+        public Criteria andDescriptionNotLike(String value) {
+            addCriterion("description not like", value, "description");
+            return (Criteria) this;
+        }
+
+        public Criteria andDescriptionIn(List<String> values) {
+            addCriterion("description in", values, "description");
+            return (Criteria) this;
+        }
+
+        public Criteria andDescriptionNotIn(List<String> values) {
+            addCriterion("description not in", values, "description");
+            return (Criteria) this;
+        }
+
+        public Criteria andDescriptionBetween(String value1, String value2) {
+            addCriterion("description between", value1, value2, "description");
+            return (Criteria) this;
+        }
+
+        public Criteria andDescriptionNotBetween(String value1, String value2) {
+            addCriterion("description not between", value1, value2, "description");
+            return (Criteria) this;
+        }
+
         public Criteria andCreatedAtIsNull() {
             addCriterion("created_at is null");
             return (Criteria) this;

health/src/main/java/com/ccsens/health/persist/dao/HealthAbnormalDao.java

@@ -1,10 +1,16 @@
 package com.ccsens.health.persist.dao;
 
+import com.ccsens.health.bean.po.HealthAbnormal;
+import com.ccsens.health.bean.vo.AbnormalVo;
 import com.ccsens.health.persist.mapper.HealthAbnormalMapper;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+
 
 @Repository
 public interface HealthAbnormalDao extends HealthAbnormalMapper {
-//    List<AbnormalVo.AbnormalStatisticsVo> getAbnormalList(@Param("post") Integer post, @Param("department")String department, @Param("healthType")Integer healthType);
+    List<AbnormalVo.AbnormalStatisticsVo> getAbnormalList(@Param("post") Integer post, @Param("department")String department, @Param("healthType")Integer healthType);
+
 }

health/src/main/java/com/ccsens/health/persist/dao/HealthRecordsDao.java

@@ -1,6 +1,5 @@
 package com.ccsens.health.persist.dao;
 
-import com.ccsens.health.bean.po.HealthRecords;
 import com.ccsens.health.bean.vo.HealthVo;
 import com.ccsens.health.bean.vo.UserVo;
 import com.ccsens.health.persist.mapper.HealthRecordsMapper;

health/src/main/java/com/ccsens/health/persist/dao/JourneyAbnormalDao.java

@@ -0,0 +1,8 @@
+package com.ccsens.health.persist.dao;
+
+import com.ccsens.health.persist.mapper.JourneyAbnormalMapper;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface JourneyAbnormalDao extends JourneyAbnormalMapper {
+}

health/src/main/java/com/ccsens/health/service/AbnormalService.java

@@ -3,6 +3,7 @@ package com.ccsens.health.service;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.lang.Snowflake;
 import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
 import com.ccsens.health.bean.dto.AbnormalDto;
 import com.ccsens.health.bean.po.HealthAbnormal;
 import com.ccsens.health.bean.vo.AbnormalVo;
@@ -10,6 +11,7 @@ import com.ccsens.health.persist.dao.HealthAbnormalDao;
 import com.ccsens.util.CodeEnum;
 import com.ccsens.util.bean.dto.QueryDto;
 import com.ccsens.util.exception.BaseException;
+import com.github.pagehelper.PageHelper;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -42,7 +44,7 @@ public class AbnormalService implements IAbnormalService{
      * @param params
      */
     @Override
-    public void AddAbnormal(QueryDto<AbnormalDto.AddAbnormal> params) {
+    public void addAbnormal(QueryDto<AbnormalDto.AddAbnormal> params) {
         AbnormalDto.AddAbnormal addAbnormal = params.getParam();
         HealthAbnormal healthAbnormal = new HealthAbnormal();
         healthAbnormal.setId(snowflake.nextId());
@@ -54,18 +56,14 @@ public class AbnormalService implements IAbnormalService{
      * 异常人员统计
      */
     @Override
-    public List<AbnormalVo.AbnormalStatisticsVo> AbnormalStatistics(QueryDto<AbnormalDto.AbnormalStatisticsDto> params) {
+    public List<AbnormalVo.AbnormalStatisticsVo> abnormalStatistics(QueryDto<AbnormalDto.AbnormalStatisticsDto> params) {
         AbnormalDto.AbnormalStatisticsDto abnormalDto = params.getParam();
         Integer page = abnormalDto.getPage() == null ? 1 : abnormalDto.getPage();
 
+        PageHelper.startPage(page, 10);
+        List<AbnormalVo.AbnormalStatisticsVo> abnormalList = healthAbnormalDao.getAbnormalList(abnormalDto.getPost(), abnormalDto.getDepartment(), abnormalDto.getHealthType());
 
-//        PageHelper.startPage(page, 10);
+        return abnormalList;
-//        List<AbnormalVo.AbnormalStatisticsVo> abnormalList = healthAbnormalDao.getAbnormalList(abnormalDto.getPost(), abnormalDto.getDepartment(), abnormalDto.getHealthType());
-//        log.info("医生信息");
-//        PageInfo pageInfo =new PageInfo<>(abnormalList);
-//
-//        return abnormalList;
-        return null;
     }
 
     /**
@@ -74,7 +72,37 @@ public class AbnormalService implements IAbnormalService{
      */
     @Override
     public void updateAbnormal(QueryDto<AbnormalDto.UpdateAbnormal> params) {
-
+        AbnormalDto.UpdateAbnormal updateAbnormal = params.getParam();
+        HealthAbnormal healthAbnormal = healthAbnormalDao.selectByPrimaryKey(updateAbnormal.getId());
+        if(ObjectUtil.isNull(healthAbnormal)){
+            throw new BaseException(CodeEnum.PARAM_ERROR);
+        }
+        //修改信息
+        if(StrUtil.isNotEmpty(updateAbnormal.getWkno())){
+            healthAbnormal.setWkno(updateAbnormal.getWkno());
+        }
+        if(StrUtil.isNotEmpty(updateAbnormal.getName())){
+            healthAbnormal.setName(updateAbnormal.getName());
+        }
+        if(StrUtil.isNotEmpty(updateAbnormal.getDepartment())){
+            healthAbnormal.setDepartment(updateAbnormal.getDepartment());
+        }
+        if(ObjectUtil.isNotNull(updateAbnormal.getAnimalHeat())){
+            healthAbnormal.setAnimalHeat(updateAbnormal.getAnimalHeat());
+        }
+        if(StrUtil.isNotEmpty(updateAbnormal.getReason())){
+            healthAbnormal.setReason(updateAbnormal.getReason());
+        }
+        if(ObjectUtil.isNotNull(updateAbnormal.getHealthType())){
+            healthAbnormal.setHealthStatus((short) updateAbnormal.getHealthType());
+        }
+        if(ObjectUtil.isNotNull(updateAbnormal.getStartTime())){
+            healthAbnormal.setStartTime(updateAbnormal.getStartTime());
+        }
+        if(ObjectUtil.isNotNull(updateAbnormal.getEndTime())){
+            healthAbnormal.setEndTime(updateAbnormal.getEndTime());
+        }
+        healthAbnormalDao.updateByPrimaryKeySelective(healthAbnormal);
     }
 
     /**

health/src/main/java/com/ccsens/health/service/IAbnormalService.java

@@ -9,9 +9,9 @@ import java.util.List;
 public interface IAbnormalService {
     List<AbnormalVo.AbnormalOverview> abnormalOverview(QueryDto<AbnormalDto.SelectAbnormal> params);
 
-    void AddAbnormal(QueryDto<AbnormalDto.AddAbnormal> params);
+    void addAbnormal(QueryDto<AbnormalDto.AddAbnormal> params);
 
-    List<AbnormalVo.AbnormalStatisticsVo> AbnormalStatistics(QueryDto<AbnormalDto.AbnormalStatisticsDto> params);
+    List<AbnormalVo.AbnormalStatisticsVo> abnormalStatistics(QueryDto<AbnormalDto.AbnormalStatisticsDto> params);
 
     void updateAbnormal(QueryDto<AbnormalDto.UpdateAbnormal> params);
 

health/src/main/java/com/ccsens/health/service/JourneyService.java

@@ -9,9 +9,11 @@ import com.ccsens.health.bean.dto.JourneyDto;
 import com.ccsens.health.bean.po.Employee;
 import com.ccsens.health.bean.po.EmployeeExample;
 import com.ccsens.health.bean.po.Journey;
+import com.ccsens.health.bean.po.JourneyAbnormal;
 import com.ccsens.health.bean.vo.JourneyVo;
 import com.ccsens.health.bean.vo.UserVo;
 import com.ccsens.health.persist.dao.EmployeeDao;
+import com.ccsens.health.persist.dao.JourneyAbnormalDao;
 import com.ccsens.health.persist.dao.JourneyDao;
 import com.ccsens.health.util.HealthConstant;
 import com.ccsens.util.CodeEnum;
@@ -35,13 +37,9 @@ import java.util.List;
 @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
 public class JourneyService implements IJourneyService{
 
-    @Autowired
-    private IUserService userService;
     @Autowired
     private Snowflake snowflake;
     @Autowired
-    private EmployeeDao employeeDao;
-    @Autowired
     private JourneyDao journeyDao;
     @Autowired
     private TallFeignClient tallFeignClient;
@@ -51,6 +49,8 @@ public class JourneyService implements IJourneyService{
     private IStudentService studentService;
     @Resource
     private IAsyncService asyncService;
+    @Autowired
+    private JourneyAbnormalDao journeyAbnormalDao;
 
     @Override
     public JourneyVo.BackSchoolStatistics backSchoolStatistics() {
@@ -150,7 +150,11 @@ public class JourneyService implements IJourneyService{
      */
     @Override
     public void addAbnormalJourney(QueryDto<JourneyDto.AddAbnormalJourney> params) {
-
+        JourneyDto.AddAbnormalJourney addAbnormalJourney = params.getParam();
+        JourneyAbnormal journeyAbnormal = new JourneyAbnormal();
+        BeanUtil.copyProperties(addAbnormalJourney,journeyAbnormal);
+        journeyAbnormal.setId(snowflake.nextId());
+        journeyAbnormalDao.insertSelective(journeyAbnormal);
     }
 
     /**
@@ -178,6 +182,6 @@ public class JourneyService implements IJourneyService{
      */
     @Override
     public void deleteAbnormalJourney(QueryDto<JourneyDto.DeleteAbnormalJourney> params) {
-
+        JourneyAbnormal journeyAbnormal = journeyAbnormalDao.selectByPrimaryKey(params.getParam().getId());
     }
 }

health/src/main/resources/mapper_dao/HealthAbnormalDao.xml

@@ -0,0 +1,48 @@
+<?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.ccsens.health.persist.dao.HealthAbnormalDao">
+
+    <resultMap id="resultMap_abnormal_statistics" type="com.ccsens.health.bean.vo.AbnormalVo$AbnormalStatisticsVo">
+        <id column="id" property="id"/>
+        <result column="wkno" property="wkno"/>
+        <result column="name" property="name"/>
+        <result column="department" property="department"/>
+        <result column="animalHeat" property="animalHeat"/>
+        <result column="reason" property="reason"/>
+        <result column="healthType" property="healthType"/>
+        <result column="startTime" property="startTime"/>
+        <result column="endTime" property="endTime"/>
+    </resultMap>
+
+    <select id="getAbnormalList" resultMap="resultMap_abnormal_statistics" parameterType="java.util.Map">
+        select
+            a.id as id,
+            a.wkno as wkno,
+            a.name as name,
+            a.department as department,
+            a.animal_heat as animalHeat,
+            a.reason as reason,
+            a.health_status as healthType,
+            a.start_time as startTime,
+            a.end_time as endTime
+        from
+            t_health_abnormal a left join t_member m on a.wkno = m.wkno
+        where
+            a.rec_status = 0
+        <if test="post == 0">
+            and
+            m.type != 2
+        </if>
+        <if test="post != 0">
+            and
+            m.type = 2
+        </if>
+        <if test="department != null">
+        and
+            a.department = #{department}
+        </if>
+        <if test="healthType != null">
+            a.health_status = #{healthType}
+        </if>
+    </select>
+</mapper>

health/src/main/resources/mapper_raw/JourneyAbnormalMapper.xml

@@ -7,6 +7,7 @@
     <result column="car_no" jdbcType="VARCHAR" property="carNo" />
     <result column="start_time" jdbcType="BIGINT" property="startTime" />
     <result column="end_time" jdbcType="BIGINT" property="endTime" />
+    <result column="description" jdbcType="VARCHAR" property="description" />
     <result column="created_at" jdbcType="TIMESTAMP" property="createdAt" />
     <result column="updated_at" jdbcType="TIMESTAMP" property="updatedAt" />
     <result column="rec_status" jdbcType="TINYINT" property="recStatus" />
@@ -70,7 +71,8 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    id, trip_mode, car_no, start_time, end_time, created_at, updated_at, rec_status
+    id, trip_mode, car_no, start_time, end_time, description, created_at, updated_at, 
+    rec_status
   </sql>
   <select id="selectByExample" parameterType="com.ccsens.health.bean.po.JourneyAbnormalExample" resultMap="BaseResultMap">
     select
@@ -104,11 +106,13 @@
   </delete>
   <insert id="insert" parameterType="com.ccsens.health.bean.po.JourneyAbnormal">
     insert into t_journey_abnormal (id, trip_mode, car_no, 
-      start_time, end_time, created_at, 
+      start_time, end_time, description, 
-      updated_at, rec_status)
+      created_at, updated_at, rec_status
+      )
     values (#{id,jdbcType=BIGINT}, #{tripMode,jdbcType=VARCHAR}, #{carNo,jdbcType=VARCHAR}, 
-      #{startTime,jdbcType=BIGINT}, #{endTime,jdbcType=BIGINT}, #{createdAt,jdbcType=TIMESTAMP}, 
+      #{startTime,jdbcType=BIGINT}, #{endTime,jdbcType=BIGINT}, #{description,jdbcType=VARCHAR}, 
-      #{updatedAt,jdbcType=TIMESTAMP}, #{recStatus,jdbcType=TINYINT})
+      #{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP}, #{recStatus,jdbcType=TINYINT}
+      )
   </insert>
   <insert id="insertSelective" parameterType="com.ccsens.health.bean.po.JourneyAbnormal">
     insert into t_journey_abnormal
@@ -128,6 +132,9 @@
       <if test="endTime != null">
         end_time,
       </if>
+      <if test="description != null">
+        description,
+      </if>
       <if test="createdAt != null">
         created_at,
       </if>
@@ -154,6 +161,9 @@
       <if test="endTime != null">
         #{endTime,jdbcType=BIGINT},
       </if>
+      <if test="description != null">
+        #{description,jdbcType=VARCHAR},
+      </if>
       <if test="createdAt != null">
         #{createdAt,jdbcType=TIMESTAMP},
       </if>
@@ -189,6 +199,9 @@
       <if test="record.endTime != null">
         end_time = #{record.endTime,jdbcType=BIGINT},
       </if>
+      <if test="record.description != null">
+        description = #{record.description,jdbcType=VARCHAR},
+      </if>
       <if test="record.createdAt != null">
         created_at = #{record.createdAt,jdbcType=TIMESTAMP},
       </if>
@@ -210,6 +223,7 @@
       car_no = #{record.carNo,jdbcType=VARCHAR},
       start_time = #{record.startTime,jdbcType=BIGINT},
       end_time = #{record.endTime,jdbcType=BIGINT},
+      description = #{record.description,jdbcType=VARCHAR},
       created_at = #{record.createdAt,jdbcType=TIMESTAMP},
       updated_at = #{record.updatedAt,jdbcType=TIMESTAMP},
       rec_status = #{record.recStatus,jdbcType=TINYINT}
@@ -232,6 +246,9 @@
       <if test="endTime != null">
         end_time = #{endTime,jdbcType=BIGINT},
       </if>
+      <if test="description != null">
+        description = #{description,jdbcType=VARCHAR},
+      </if>
       <if test="createdAt != null">
         created_at = #{createdAt,jdbcType=TIMESTAMP},
       </if>
@@ -250,6 +267,7 @@
       car_no = #{carNo,jdbcType=VARCHAR},
       start_time = #{startTime,jdbcType=BIGINT},
       end_time = #{endTime,jdbcType=BIGINT},
+      description = #{description,jdbcType=VARCHAR},
       created_at = #{createdAt,jdbcType=TIMESTAMP},
       updated_at = #{updatedAt,jdbcType=TIMESTAMP},
       rec_status = #{recStatus,jdbcType=TINYINT}

tall/src/main/java/com/ccsens/tall/bean/po/ProShow.java

@@ -20,6 +20,8 @@ public class ProShow implements Serializable {
 
     private Byte createTask;
 
+    private Byte showShortcuts;
+
     private Date createdAt;
 
     private Date updatedAt;
@@ -92,6 +94,14 @@ public class ProShow implements Serializable {
         this.createTask = createTask;
     }
 
+    public Byte getShowShortcuts() {
+        return showShortcuts;
+    }
+
+    public void setShowShortcuts(Byte showShortcuts) {
+        this.showShortcuts = showShortcuts;
+    }
+
     public Date getCreatedAt() {
         return createdAt;
     }
@@ -130,6 +140,7 @@ public class ProShow implements Serializable {
         sb.append(", duration=").append(duration);
         sb.append(", isShowMvp=").append(isShowMvp);
         sb.append(", createTask=").append(createTask);
+        sb.append(", showShortcuts=").append(showShortcuts);
         sb.append(", createdAt=").append(createdAt);
         sb.append(", updatedAt=").append(updatedAt);
         sb.append(", recStatus=").append(recStatus);

tall/src/main/java/com/ccsens/tall/bean/po/ProShowExample.java

@@ -595,6 +595,66 @@ public class ProShowExample {
             return (Criteria) this;
         }
 
+        public Criteria andShowShortcutsIsNull() {
+            addCriterion("show_shortcuts is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andShowShortcutsIsNotNull() {
+            addCriterion("show_shortcuts is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andShowShortcutsEqualTo(Byte value) {
+            addCriterion("show_shortcuts =", value, "showShortcuts");
+            return (Criteria) this;
+        }
+
+        public Criteria andShowShortcutsNotEqualTo(Byte value) {
+            addCriterion("show_shortcuts <>", value, "showShortcuts");
+            return (Criteria) this;
+        }
+
+        public Criteria andShowShortcutsGreaterThan(Byte value) {
+            addCriterion("show_shortcuts >", value, "showShortcuts");
+            return (Criteria) this;
+        }
+
+        public Criteria andShowShortcutsGreaterThanOrEqualTo(Byte value) {
+            addCriterion("show_shortcuts >=", value, "showShortcuts");
+            return (Criteria) this;
+        }
+
+        public Criteria andShowShortcutsLessThan(Byte value) {
+            addCriterion("show_shortcuts <", value, "showShortcuts");
+            return (Criteria) this;
+        }
+
+        public Criteria andShowShortcutsLessThanOrEqualTo(Byte value) {
+            addCriterion("show_shortcuts <=", value, "showShortcuts");
+            return (Criteria) this;
+        }
+
+        public Criteria andShowShortcutsIn(List<Byte> values) {
+            addCriterion("show_shortcuts in", values, "showShortcuts");
+            return (Criteria) this;
+        }
+
+        public Criteria andShowShortcutsNotIn(List<Byte> values) {
+            addCriterion("show_shortcuts not in", values, "showShortcuts");
+            return (Criteria) this;
+        }
+
+        public Criteria andShowShortcutsBetween(Byte value1, Byte value2) {
+            addCriterion("show_shortcuts between", value1, value2, "showShortcuts");
+            return (Criteria) this;
+        }
+
+        public Criteria andShowShortcutsNotBetween(Byte value1, Byte value2) {
+            addCriterion("show_shortcuts not between", value1, value2, "showShortcuts");
+            return (Criteria) this;
+        }
+
         public Criteria andCreatedAtIsNull() {
             addCriterion("created_at is null");
             return (Criteria) this;

tall/src/main/java/com/ccsens/tall/bean/vo/TaskVo.java

@@ -96,6 +96,8 @@ public class TaskVo {
         private Long duration;
         @ApiModelProperty("显示的日期格式")
         private String showTimeFormat;
+        @ApiModelProperty("是否展示快捷方式（交付物硬件按钮）0不展示 1展示")
+        private int showShortcuts;
         @ApiModelProperty("循环周期")
         private String cycle;
         @ApiModelProperty("跳转模式 0自动，1延迟,2手动")

tall/src/main/java/com/ccsens/tall/service/ProTaskDetailService.java

@@ -145,7 +145,17 @@ public class ProTaskDetailService implements IProTaskDetailService {
                     normalTask.setRoutineLocation(config.getRoutineLocation());
                     normalTask.setWebPath(config.getWebPath());
                 }
-
+                //一级任务的配置
+                if(ObjectUtil.isNotNull(proShow)){
+                    normalTask.setShowShortcuts(proShow.getShowShortcuts());
+                    normalTask.setShowTimeFormat(proShow.getTimeShow());
+                    if(proShow.getDuration() == 1){
+                        normalTask.setDuration(null);
+                    }
+                }else {
+                    normalTask.setShowTimeFormat("MM-dd HH:mm");
+                    normalTask.setShowShortcuts(1);
+                }
 
                 //一级任务完成状态
                 ProSubTimeMember firstSubTimeMember = getProcessByUserIdAndTask(currentUserId, normalTask.getId());
@@ -171,12 +181,14 @@ public class ProTaskDetailService implements IProTaskDetailService {
                             task.setProcess(subTimeMember.getComplatedStatus());
                         }
                         if(ObjectUtil.isNotNull(proShow)){
+                            task.setShowShortcuts(proShow.getShowShortcuts());
                             task.setShowTimeFormat(proShow.getTimeShow());
                             if(proShow.getDuration() == 1){
                                 task.setDuration(null);
                             }
                         }else {
                             task.setShowTimeFormat("MM-dd HH:mm");
+                            task.setShowShortcuts(1);
                         }
                     }
                     TaskUtil.Task task = TaskUtil.splitTask(secondNormalTaskList, startTime, endTime, process);
@@ -247,12 +259,14 @@ public class ProTaskDetailService implements IProTaskDetailService {
                     normalTask.setRealEndTime(subTimeMember.getRealFinishTime());
                 }
                 if(ObjectUtil.isNotNull(proShow)){
+                    normalTask.setShowShortcuts(proShow.getShowShortcuts());
                     normalTask.setShowTimeFormat(proShow.getTimeShow());
                     if(proShow.getDuration() == 1){
                         normalTask.setDuration(null);
                     }
                 }else {
                     normalTask.setShowTimeFormat("MM-dd HH:mm");
+                    normalTask.setShowShortcuts(1);
                 }
             }
             TaskUtil.Task task = TaskUtil.splitTask(secondTaskVoList, startTime, endTime, process);
@@ -519,12 +533,14 @@ public class ProTaskDetailService implements IProTaskDetailService {
                 }
                 //显示的日期格式和时长格式
                 if (ObjectUtil.isNotNull(proShow)) {
+                    taskDetail.setShowShortcuts(proShow.getShowShortcuts());
                     taskDetail.setShowTimeFormat(proShow.getTimeShow());
                     if (proShow.getDuration() == 1) {
                         taskDetail.setDuration(null);
                     }
                 } else {
                     taskDetail.setShowTimeFormat("MM-dd HH:mm");
+                    taskDetail.setShowShortcuts(1);
                 }
                 //添加项目信息和插件信息
                 normalTaskAddPlugin(currentUserId, subTime.getTaskDetailId(), taskDetail);
@@ -551,12 +567,14 @@ public class ProTaskDetailService implements IProTaskDetailService {
                                 }
                                 //显示的日期格式和时长格式
                                 if(ObjectUtil.isNotNull(proShow)){
+                                    groupTask.setShowShortcuts(proShow.getShowShortcuts());
                                     groupTask.setShowTimeFormat(proShow.getTimeShow());
                                     if(proShow.getDuration() == 1){
                                         groupTask.setDuration(null);
                                     }
                                 }else {
                                     groupTask.setShowTimeFormat("MM-dd HH:mm");
+                                    groupTask.setShowShortcuts(1);
                                 }
                                 //添加项目信息和插件信息
                                 normalTaskAddPlugin(currentUserId, groupTask.getDetailId(), groupTask);

tall/src/main/resources/mapper_raw/ProShowMapper.xml

@@ -10,6 +10,7 @@
     <result column="duration" jdbcType="TINYINT" property="duration" />
     <result column="is_show_mvp" jdbcType="TINYINT" property="isShowMvp" />
     <result column="create_task" jdbcType="TINYINT" property="createTask" />
+    <result column="show_shortcuts" jdbcType="TINYINT" property="showShortcuts" />
     <result column="created_at" jdbcType="TIMESTAMP" property="createdAt" />
     <result column="updated_at" jdbcType="TIMESTAMP" property="updatedAt" />
     <result column="rec_status" jdbcType="TINYINT" property="recStatus" />
@@ -73,8 +74,8 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    id, project_id, slide, filter, time_show, duration, is_show_mvp, create_task, created_at, 
+    id, project_id, slide, filter, time_show, duration, is_show_mvp, create_task, show_shortcuts, 
-    updated_at, rec_status
+    created_at, updated_at, rec_status
   </sql>
   <select id="selectByExample" parameterType="com.ccsens.tall.bean.po.ProShowExample" resultMap="BaseResultMap">
     select
@@ -109,12 +110,14 @@
   <insert id="insert" parameterType="com.ccsens.tall.bean.po.ProShow">
     insert into t_pro_show (id, project_id, slide, 
       filter, time_show, duration, 
-      is_show_mvp, create_task, created_at, 
+      is_show_mvp, create_task, show_shortcuts, 
-      updated_at, rec_status)
+      created_at, updated_at, rec_status
+      )
     values (#{id,jdbcType=BIGINT}, #{projectId,jdbcType=BIGINT}, #{slide,jdbcType=TINYINT}, 
       #{filter,jdbcType=TINYINT}, #{timeShow,jdbcType=VARCHAR}, #{duration,jdbcType=TINYINT}, 
-      #{isShowMvp,jdbcType=TINYINT}, #{createTask,jdbcType=TINYINT}, #{createdAt,jdbcType=TIMESTAMP}, 
+      #{isShowMvp,jdbcType=TINYINT}, #{createTask,jdbcType=TINYINT}, #{showShortcuts,jdbcType=TINYINT}, 
-      #{updatedAt,jdbcType=TIMESTAMP}, #{recStatus,jdbcType=TINYINT})
+      #{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP}, #{recStatus,jdbcType=TINYINT}
+      )
   </insert>
   <insert id="insertSelective" parameterType="com.ccsens.tall.bean.po.ProShow">
     insert into t_pro_show
@@ -143,6 +146,9 @@
       <if test="createTask != null">
         create_task,
       </if>
+      <if test="showShortcuts != null">
+        show_shortcuts,
+      </if>
       <if test="createdAt != null">
         created_at,
       </if>
@@ -178,6 +184,9 @@
       <if test="createTask != null">
         #{createTask,jdbcType=TINYINT},
       </if>
+      <if test="showShortcuts != null">
+        #{showShortcuts,jdbcType=TINYINT},
+      </if>
       <if test="createdAt != null">
         #{createdAt,jdbcType=TIMESTAMP},
       </if>
@@ -222,6 +231,9 @@
       <if test="record.createTask != null">
         create_task = #{record.createTask,jdbcType=TINYINT},
       </if>
+      <if test="record.showShortcuts != null">
+        show_shortcuts = #{record.showShortcuts,jdbcType=TINYINT},
+      </if>
       <if test="record.createdAt != null">
         created_at = #{record.createdAt,jdbcType=TIMESTAMP},
       </if>
@@ -246,6 +258,7 @@
       duration = #{record.duration,jdbcType=TINYINT},
       is_show_mvp = #{record.isShowMvp,jdbcType=TINYINT},
       create_task = #{record.createTask,jdbcType=TINYINT},
+      show_shortcuts = #{record.showShortcuts,jdbcType=TINYINT},
       created_at = #{record.createdAt,jdbcType=TIMESTAMP},
       updated_at = #{record.updatedAt,jdbcType=TIMESTAMP},
       rec_status = #{record.recStatus,jdbcType=TINYINT}
@@ -277,6 +290,9 @@
       <if test="createTask != null">
         create_task = #{createTask,jdbcType=TINYINT},
       </if>
+      <if test="showShortcuts != null">
+        show_shortcuts = #{showShortcuts,jdbcType=TINYINT},
+      </if>
       <if test="createdAt != null">
         created_at = #{createdAt,jdbcType=TIMESTAMP},
       </if>
@@ -298,6 +314,7 @@
       duration = #{duration,jdbcType=TINYINT},
       is_show_mvp = #{isShowMvp,jdbcType=TINYINT},
       create_task = #{createTask,jdbcType=TINYINT},
+      show_shortcuts = #{showShortcuts,jdbcType=TINYINT},
       created_at = #{createdAt,jdbcType=TIMESTAMP},
       updated_at = #{updatedAt,jdbcType=TIMESTAMP},
       rec_status = #{recStatus,jdbcType=TINYINT}