Merge branch 'pt' of dd.tall.wiki:ccsens_wiki/ccsenscloud into pt

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

@@ -26,6 +26,8 @@ public class ProDeliverHistoryRecord implements Serializable {
 
     private Long memberId;
 
+    private String historyRemark;
+
     private static final long serialVersionUID = 1L;
 
     public Long getId() {
@@ -116,6 +118,14 @@ public class ProDeliverHistoryRecord implements Serializable {
         this.memberId = memberId;
     }
 
+    public String getHistoryRemark() {
+        return historyRemark;
+    }
+
+    public void setHistoryRemark(String historyRemark) {
+        this.historyRemark = historyRemark == null ? null : historyRemark.trim();
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -133,6 +143,7 @@ public class ProDeliverHistoryRecord implements Serializable {
         sb.append(", updatedAt=").append(updatedAt);
         sb.append(", recStatus=").append(recStatus);
         sb.append(", memberId=").append(memberId);
+        sb.append(", historyRemark=").append(historyRemark);
         sb.append("]");
         return sb.toString();
     }

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

@@ -774,6 +774,76 @@ public class ProDeliverHistoryRecordExample {
             addCriterion("member_id not between", value1, value2, "memberId");
             return (Criteria) this;
         }
+
+        public Criteria andHistoryRemarkIsNull() {
+            addCriterion("history_remark is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andHistoryRemarkIsNotNull() {
+            addCriterion("history_remark is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andHistoryRemarkEqualTo(String value) {
+            addCriterion("history_remark =", value, "historyRemark");
+            return (Criteria) this;
+        }
+
+        public Criteria andHistoryRemarkNotEqualTo(String value) {
+            addCriterion("history_remark <>", value, "historyRemark");
+            return (Criteria) this;
+        }
+
+        public Criteria andHistoryRemarkGreaterThan(String value) {
+            addCriterion("history_remark >", value, "historyRemark");
+            return (Criteria) this;
+        }
+
+        public Criteria andHistoryRemarkGreaterThanOrEqualTo(String value) {
+            addCriterion("history_remark >=", value, "historyRemark");
+            return (Criteria) this;
+        }
+
+        public Criteria andHistoryRemarkLessThan(String value) {
+            addCriterion("history_remark <", value, "historyRemark");
+            return (Criteria) this;
+        }
+
+        public Criteria andHistoryRemarkLessThanOrEqualTo(String value) {
+            addCriterion("history_remark <=", value, "historyRemark");
+            return (Criteria) this;
+        }
+
+        public Criteria andHistoryRemarkLike(String value) {
+            addCriterion("history_remark like", value, "historyRemark");
+            return (Criteria) this;
+        }
+
+        public Criteria andHistoryRemarkNotLike(String value) {
+            addCriterion("history_remark not like", value, "historyRemark");
+            return (Criteria) this;
+        }
+
+        public Criteria andHistoryRemarkIn(List<String> values) {
+            addCriterion("history_remark in", values, "historyRemark");
+            return (Criteria) this;
+        }
+
+        public Criteria andHistoryRemarkNotIn(List<String> values) {
+            addCriterion("history_remark not in", values, "historyRemark");
+            return (Criteria) this;
+        }
+
+        public Criteria andHistoryRemarkBetween(String value1, String value2) {
+            addCriterion("history_remark between", value1, value2, "historyRemark");
+            return (Criteria) this;
+        }
+
+        public Criteria andHistoryRemarkNotBetween(String value1, String value2) {
+            addCriterion("history_remark not between", value1, value2, "historyRemark");
+            return (Criteria) this;
+        }
     }
 
     public static class Criteria extends GeneratedCriteria {

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

@@ -93,10 +93,6 @@ public class InputDocVo {
     public static class DeliverHistory{
         @ApiModelProperty("交付物历史记录的id")
         private Long id;
-        @ApiModelProperty("角色id")
-        private Long roleId;
-        @ApiModelProperty("角色名称")
-        private String roleName;
         @ApiModelProperty("成员id")
         private Long memberId;
         @ApiModelProperty("成员名称")
@@ -107,11 +103,13 @@ public class InputDocVo {
         private String remark;
         @ApiModelProperty("操作类型(0-上传,1-修改,2-删除,3-通过,4-驳回,5-添加[添加备注])")
         private Byte doType;
-        @JsonFormat(pattern="yyyy-MM-dd HH:mm")
+        @JsonFormat(pattern="MM.dd/HH:mm",timezone="GMT+8")
         @ApiModelProperty("记录创建时间")
         private Date createAt;
         @ApiModelProperty("内容")
         private String content;
+        @ApiModelProperty("历史备注信息")
+        private String historyRemark;
         @JsonIgnore
         @ApiModelProperty
         private String fileIds;

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

@@ -51,6 +51,6 @@ public interface ITaskDeliverService {
      * 修改输出文档下的备注信息
      * @param param
      */
-    void updateRemarkOfDeliver(DeliverDto.UpdateRemarkOfDeliver param);
+    void updateRemarkOfDeliver(DeliverDto.UpdateRemarkOfDeliver param,Long userId);
 
 }

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

@@ -264,6 +264,9 @@ public class InputDocService implements IInputDocService {
         if (ObjectUtil.isNull(doc)){
             throw new BaseException("输入文档不存在或已删除");
         }
+        //历史操作
+        ProDeliverHistoryRecord historyRecord = new ProDeliverHistoryRecord();
+
         ProTaskInputRecord proTaskInputRecord = new ProTaskInputRecord();
         //多文件添加
         if (!ArrayUtil.isEmpty(param.getFileIds())){
@@ -280,6 +283,7 @@ public class InputDocService implements IInputDocService {
             proTaskInputRecord.setUserId(userId);
             proTaskInputRecord.setRemark(param.getRemark());
             proTaskInputRecordMapper.insertSelective(proTaskInputRecord);
+            historyRecord.setHistoryRemark(param.getRemark());
 
             //通过输入文档id将输入文档表中的状态更改为已上传
             ProTaskInputDoc proTaskInputDoc = new ProTaskInputDoc();
@@ -297,6 +301,9 @@ public class InputDocService implements IInputDocService {
             proTaskInputRecord.setRemark(param.getRemark());
             proTaskInputRecordMapper.insertSelective(proTaskInputRecord);
 
+            //将备注保存到历史记录的备注中
+            historyRecord.setHistoryRemark(param.getRemark());
+
             //通过输入文档id将输入文档表中的状态更改为已上传
             ProTaskInputDoc proTaskInputDoc = new ProTaskInputDoc();
             proTaskInputDoc.setId(param.getDocId());
@@ -308,12 +315,17 @@ public class InputDocService implements IInputDocService {
         ProMember proMember = iProMemberService.selectByUserId(userId, taskDetail.getProjectId());
 
         //将操作记录添加到历史记录表中
-        ProDeliverHistoryRecord historyRecord = new ProDeliverHistoryRecord();
         historyRecord.setId(snowflake.nextId());
         historyRecord.setDeliverId(param.getDocId());
         historyRecord.setDeliverType((byte)0);
         historyRecord.setDeliverRecordId(proTaskInputRecord.getId());
-        historyRecord.setDoType((byte)0);
+        if (ArrayUtil.isNotEmpty(param.getFileIds())){
+            //有上传文件 操作类型为上传
+            historyRecord.setDoType((byte)0);
+        }else {
+            //没有文件 操作类型为添加备注
+            historyRecord.setDoType((byte)5);
+        }
         historyRecord.setMemberId(proMember.getId());
         deliverHistoryRecordDao.insertSelective(historyRecord);
         //发送消息
@@ -470,10 +482,12 @@ public class InputDocService implements IInputDocService {
             throw new BaseException(CodeEnum.FILE_NOT_FOUND);
         }
         //查出文档信息找到任务信息
+        ProDeliverHistoryRecord historyRecord = new ProDeliverHistoryRecord();
         ProTaskInputDoc doc = proTaskInputDocMapper.selectByPrimaryKey(proTaskInputRecord.getInputDocId());
 
 
         //删除输入文档中的文件
+        historyRecord.setHistoryRemark(proTaskInputRecord.getRemark());
         ProTaskInputRecord record = new ProTaskInputRecord();
         record.setId(param.getRecordId());
         record.setRecStatus((byte)2);
@@ -497,7 +511,6 @@ public class InputDocService implements IInputDocService {
         ProMember proMember = iProMemberService.selectByUserId(userId, taskDetail.getProjectId());
 
         //将操作记录添加到历史记录表中
-        ProDeliverHistoryRecord historyRecord = new ProDeliverHistoryRecord();
         historyRecord.setId(snowflake.nextId());
         historyRecord.setDeliverId(doc.getId());
         historyRecord.setDeliverType((byte)0);
@@ -548,6 +561,7 @@ public class InputDocService implements IInputDocService {
         historyRecord.setDeliverRecordId(doc.getId());
         historyRecord.setDoType((byte)1);
         historyRecord.setMemberId(proMember.getId());
+        historyRecord.setHistoryRemark(param.getRemark());
         deliverHistoryRecordDao.insertSelective(historyRecord);
 
     }
@@ -698,8 +712,8 @@ public class InputDocService implements IInputDocService {
                         }
                     }
                 }
-                return  new PageInfo<>(historyList);
             }
+            return  new PageInfo<>(historyList);
         }
         return null;
     }

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

@@ -1040,6 +1040,7 @@ public class TaskDeliverService implements ITaskDeliverService {
             historyRecord.setDeliverRecordId(deliverPostLog.getId());
             historyRecord.setDoType((byte)2);
             historyRecord.setMemberId(proMember.getId());
+            historyRecord.setHistoryRemark(deliverPostLog.getDescription());
             deliverHistoryRecordDao.insertSelective(historyRecord);
 
             //用智能助手发送消息
@@ -1185,13 +1186,36 @@ public class TaskDeliverService implements ITaskDeliverService {
      * @param param
      */
     @Override
-    public void updateRemarkOfDeliver(DeliverDto.UpdateRemarkOfDeliver param) {
+    public void updateRemarkOfDeliver(DeliverDto.UpdateRemarkOfDeliver param,Long userId) {
         ProTaskDeliverPostLog deliverPostLog = new ProTaskDeliverPostLog();
         deliverPostLog.setId(param.getRecordId());
         if (StrUtil.isNotBlank(param.getRemark())){
             deliverPostLog.setDescription(param.getRemark());
         }
         deliverPostLogDao.updateByPrimaryKeySelective(deliverPostLog);
+
+        ProTaskDeliverPostLog proTaskDeliverPostLog = deliverPostLogDao.selectByPrimaryKey(param.getRecordId());
+        ProTaskDeliver taskDeliver = taskDeliverDao.selectByPrimaryKey(proTaskDeliverPostLog.getDeliverId());
+        ProTaskDetail taskDetail = taskDetailDao.selectByPrimaryKey(taskDeliver.getTaskDetailId());
+
+        //将操作保存到历史信息记录表
+        //查找项目id
+        try {
+            ProMember proMember = iProMemberService.selectByUserId(userId, taskDetail.getProjectId());
+            //将操作记录添加到历史记录表中
+            ProDeliverHistoryRecord historyRecord = new ProDeliverHistoryRecord();
+            historyRecord.setId(snowflake.nextId());
+            historyRecord.setDeliverId(taskDeliver.getId());
+            historyRecord.setDeliverType((byte)0);
+            historyRecord.setDeliverRecordId(proTaskDeliverPostLog.getId());
+            historyRecord.setDoType((byte)1);
+            historyRecord.setMemberId(proMember.getId());
+            historyRecord.setHistoryRemark(param.getRemark());
+            deliverHistoryRecordDao.insertSelective(historyRecord);
+        }catch (Exception e){
+            log.info("保存输出文档历史记录失败",e);
+        }
+
     }
 
 }

tall/src/main/java/com/ccsens/tall/web/DeliverController.java

@@ -203,7 +203,7 @@ public class DeliverController {
     @RequestMapping(value = "/updateRemarkOfDeliver", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
     public JsonResponse updateRemarkOfDeliver(@ApiParam @Validated @RequestBody QueryDto<DeliverDto.UpdateRemarkOfDeliver> params) {
         log.info("修改输出文档中的备注：{}",params);
-        deliverService.updateRemarkOfDeliver(params.getParam());
+        deliverService.updateRemarkOfDeliver(params.getParam(),params.getUserId());
         log.info("修改输出文档中的备注");
         return JsonResponse.newInstance().ok();
     }

tall/src/main/java/com/ccsens/tall/web/InputDocController.java

@@ -156,7 +156,7 @@ public class InputDocController {
     public JsonResponse<PageInfo<InputDocVo.DeliverHistory>> viewDeliverHistory(@ApiParam @Validated @RequestBody QueryDto<InputDocDto.DeliverHistory> params) {
         log.info("查看交付物的历史记录：{}",params);
         PageInfo<InputDocVo.DeliverHistory> deliverHistory = iInputDocService.viewDeliverHistory(params.getParam());
-        log.info("查看交付物的历史记录");
+        log.info("查看交付物的历史记录:{}",deliverHistory);
         return JsonResponse.newInstance().ok(deliverHistory);
     }
 

tall/src/main/resources/mapper_dao/ProDeliverHistoryRecordDao.xml

@@ -13,7 +13,8 @@
             pdhr.created_at AS createAt,
             pdhr.content AS content,
             pm.id AS memberId,
-            pm.nickname AS memberName
+            pm.nickname AS memberName,
+            pdhr.history_remark AS historyRemark
         FROM
             t_pro_deliver_history_record AS pdhr
         LEFT JOIN t_pro_role AS pr ON pdhr.role_id = pr.id

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

@@ -13,6 +13,7 @@
     <result column="updated_at" jdbcType="TIMESTAMP" property="updatedAt" />
     <result column="rec_status" jdbcType="TINYINT" property="recStatus" />
     <result column="member_id" jdbcType="BIGINT" property="memberId" />
+    <result column="history_remark" jdbcType="VARCHAR" property="historyRemark" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <where>
@@ -74,7 +75,7 @@
   </sql>
   <sql id="Base_Column_List">
     id, deliver_id, deliver_type, deliver_record_id, do_type, role_id, content, created_at, 
-    updated_at, rec_status, member_id
+    updated_at, rec_status, member_id, history_remark
   </sql>
   <select id="selectByExample" parameterType="com.ccsens.tall.bean.po.ProDeliverHistoryRecordExample" resultMap="BaseResultMap">
     select
@@ -110,11 +111,13 @@
     insert into t_pro_deliver_history_record (id, deliver_id, deliver_type, 
       deliver_record_id, do_type, role_id, 
       content, created_at, updated_at, 
-      rec_status, member_id)
+      rec_status, member_id, history_remark
+      )
     values (#{id,jdbcType=BIGINT}, #{deliverId,jdbcType=BIGINT}, #{deliverType,jdbcType=TINYINT}, 
       #{deliverRecordId,jdbcType=BIGINT}, #{doType,jdbcType=TINYINT}, #{roleId,jdbcType=BIGINT}, 
       #{content,jdbcType=VARCHAR}, #{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP}, 
-      #{recStatus,jdbcType=TINYINT}, #{memberId,jdbcType=BIGINT})
+      #{recStatus,jdbcType=TINYINT}, #{memberId,jdbcType=BIGINT}, #{historyRemark,jdbcType=VARCHAR}
+      )
   </insert>
   <insert id="insertSelective" parameterType="com.ccsens.tall.bean.po.ProDeliverHistoryRecord">
     insert into t_pro_deliver_history_record
@@ -152,6 +155,9 @@
       <if test="memberId != null">
         member_id,
       </if>
+      <if test="historyRemark != null">
+        history_remark,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -187,6 +193,9 @@
       <if test="memberId != null">
         #{memberId,jdbcType=BIGINT},
       </if>
+      <if test="historyRemark != null">
+        #{historyRemark,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.ccsens.tall.bean.po.ProDeliverHistoryRecordExample" resultType="java.lang.Long">
@@ -231,6 +240,9 @@
       <if test="record.memberId != null">
         member_id = #{record.memberId,jdbcType=BIGINT},
       </if>
+      <if test="record.historyRemark != null">
+        history_remark = #{record.historyRemark,jdbcType=VARCHAR},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -248,7 +260,8 @@
       created_at = #{record.createdAt,jdbcType=TIMESTAMP},
       updated_at = #{record.updatedAt,jdbcType=TIMESTAMP},
       rec_status = #{record.recStatus,jdbcType=TINYINT},
-      member_id = #{record.memberId,jdbcType=BIGINT}
+      member_id = #{record.memberId,jdbcType=BIGINT},
+      history_remark = #{record.historyRemark,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -286,6 +299,9 @@
       <if test="memberId != null">
         member_id = #{memberId,jdbcType=BIGINT},
       </if>
+      <if test="historyRemark != null">
+        history_remark = #{historyRemark,jdbcType=VARCHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=BIGINT}
   </update>
@@ -300,7 +316,8 @@
       created_at = #{createdAt,jdbcType=TIMESTAMP},
       updated_at = #{updatedAt,jdbcType=TIMESTAMP},
       rec_status = #{recStatus,jdbcType=TINYINT},
-      member_id = #{memberId,jdbcType=BIGINT}
+      member_id = #{memberId,jdbcType=BIGINT},
+      history_remark = #{historyRemark,jdbcType=VARCHAR}
     where id = #{id,jdbcType=BIGINT}
   </update>
 </mapper>