Merge remote-tracking branch 'origin/dev_20230221_pdlr_xuhd' into dev_ch_master

assessment/assessment-service/src/main/java/com/hungraim/ltc/controller/TaskController.java

 package com.hungraim.ltc.controller;
 
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.hungraim.ltc.dao.AprReportMapper;
 import com.hungraim.ltc.dto.QueryDto;
 import com.hungraim.ltc.pojo.entity.SysConfig.ChFndAttach;
 import com.hungraim.ltc.pojo.entity.assessment.*;
@@ -15,6 +18,7 @@ import com.hungraim.ltc.service.TppesApiException;
 import com.hungraim.ltc.util.FileUtils;
 import com.hungraim.ltc.util.Result;
 import com.hungraim.ltc.util.ResultCode;
+import com.hungraim.ltc.util.TokenParsingUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
 import org.apache.poi.ss.usermodel.Workbook;
@@ -39,6 +43,8 @@ public class TaskController {
 
     @Autowired
     private TaskService taskService;
+    @Autowired
+    private AprReportMapper aprReportMapper;
 
     /**
      * 评定任务分配、查询列表
@@ -241,6 +247,39 @@ public class TaskController {
     }
 
     /**
+     * 添加评估公示信息
+     * @param taskId
+     * @return
+     */
+    @RequestMapping("/updateReportPublicityInfo")
+    public Result updateReportPublicityInfo(ChAprReport updateChAprReport,@RequestHeader("Authorization") String token) throws TppesApiException {
+
+        if(updateChAprReport.getReportId() == null){
+            return Result.failed("reportId不能为空!");
+        }
+        String reportId = String.valueOf(updateChAprReport.getReportId());
+        log.info("reportId:" +reportId);
+        ChAprReport chAprReport = aprReportMapper.selectById(reportId);
+        if(chAprReport == null){
+            return Result.failed("未查询到信息！");
+        }
+        ChAprReport newChAprReport = new ChAprReport();
+        Integer userId = TokenParsingUtil.TokenParsing(token, "userId");
+        System.out.println(chAprReport.getPublicityUser());
+        if(chAprReport.getPublicityUser() == null){
+            newChAprReport.setPublicityUser(userId);//当前登录人
+            newChAprReport.setPublicityTime(new Date());
+        }
+        newChAprReport.setPublicityStartTime(updateChAprReport.getPublicityStartTime());
+        newChAprReport.setPublicityEndTime(updateChAprReport.getPublicityEndTime());
+        newChAprReport.setPublicityLcd(new Date());//更新时间
+        newChAprReport.setPublicityLcu(userId);//更新人
+        newChAprReport.setReportId(updateChAprReport.getReportId());
+        aprReportMapper.updateById(newChAprReport);
+        return Result.success();
+    }
+
+    /**
      * 评定任务分配
      *
      * @param taskId 评定任务id,如果多条以逗号(,)分隔

assessment/assessment-service/src/main/resources/mapper/ChDisableEvaluateMapper.xml

@@ -187,6 +187,9 @@
         (SELECT dis.DISTRICT_NAME FROM CH_FND_DISTRICT dis WHERE info.acpt_srv_city = dis.DISTRICT_CODE) acptSrvCity,
         (SELECT dis.DISTRICT_NAME FROM CH_FND_DISTRICT dis WHERE info.acpt_srv_area = dis.DISTRICT_CODE) acptSrvArea,
         lev.DISABLE_LEVEL_NAME riskLevel,
+        report.PUBLICITY_START_TIME publicityStartTime,
+        report.PUBLICITY_END_TIME  publicityEndTime,
+        report.PUBLICITY_TIME  publicityTime,
         report.EFF_TIME effTime
         FROM ch_apr_report report
         LEFT JOIN CH_APR_TASK task ON report.TASK_ID = task.TASK_ID

common/common-core/src/main/java/com/hungraim/ltc/pojo/entity/assessment/ChAprReport.java

@@ -5,6 +5,9 @@ import com.baomidou.mybatisplus.annotation.KeySequence;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
 
 @Data
 @TableName("CH_APR_REPORT")
@@ -24,8 +27,10 @@ public class ChAprReport {
     private Integer cfgModeId;
     private java.util.Date evaluateTime;
     private String remark;
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     private java.util.Date publicityStartTime;
     private java.util.Date evaluationTime;
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     private java.util.Date publicityEndTime;
     private java.util.Date fcd;
     private Integer srvModeId;
@@ -44,4 +49,8 @@ public class ChAprReport {
     private String checkRemark;
     private Integer taskId;
     private Integer lcu;
+    private java.util.Date publicityTime;
+    private Integer publicityUser;
+    private Date publicityLcd;
+    private Integer publicityLcu;
 }

common/common-core/src/main/java/com/hungraim/ltc/pojo/vo/assessment/TaskReportVO.java

@@ -73,6 +73,16 @@ public class TaskReportVO {
     //评估类型
     private Integer evaluateType;
 
+    //公示开始时间
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date publicityStartTime;
+    //公示结束时间
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date publicityEndTime;
+    //公示时间
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date publicityTime;
+
     private Map<String,Object> chAprReportFractions;
 
     //录入时间