服务制定页面接口调整

common/common-core/src/main/java/com/hungraim/ltc/pojo/vo/governance/ProgramDetailVo.java

 package com.hungraim.ltc.pojo.vo.governance;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.util.Date;
 import java.util.List;
@@ -55,7 +55,7 @@ public class ProgramDetailVo {
     /**
      * 失能人员生日
      */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date birthday;
 
     /**
@@ -96,7 +96,7 @@ public class ProgramDetailVo {
     /**
      * 评定完成日期
      */
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date assessDate;
 
     /**
@@ -112,13 +112,13 @@ public class ProgramDetailVo {
     /**
      * 方案生效时间
      */
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date programDate;
 
     /**
      * 方案结束时间
      */
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date programEndDate;
 
     /**

governance/src/main/java/com/hungraim/ltc/governance/controller/SrvProgramController.java

 package com.hungraim.ltc.governance.controller;
 
+import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.hungraim.ltc.governance.service.SrvProgramService;
 import com.hungraim.ltc.pojo.vo.governance.ProgramDetailVo;
 import com.hungraim.ltc.pojo.vo.governance.ProgramListVo;
 import com.hungraim.ltc.pojo.vo.governance.SvrSendListVo;
-import com.hungraim.ltc.governance.service.SrvProgramService;
 import com.hungraim.ltc.util.Result;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 @RestController
 @RequestMapping("/api.governance/srvProgram")
@@ -106,4 +105,10 @@ public class SrvProgramController {
         ProgramDetailVo programDetail = srvProgramService.getProgramDetailWithAdd(disabInfoId, srvOrganId);
         return Result.success(programDetail);
     }
+
+    @PostMapping("/programAndProgramSetList")
+    public Result programAndProgramSetList(ProgramDetailVo programDetailVo) {
+        log.info(JSONUtil.toJsonStr(programDetailVo));
+        return Result.success();
+    }
 }

governance/src/main/resources/com/hungraim/ltc/governance/mapper/ChSrvProgramMapper.xml

@@ -4,7 +4,7 @@
 
 
     <resultMap id="ProgramSetDetailVoMap" type="com.hungraim.ltc.pojo.vo.governance.ProgramDetailVo">
-        <id column="PROGRAM_ID" property="programId"/>
+        <result column="PROGRAM_ID" property="programId"/>
         <result column="SRV_ORGAN_ID" property="srvOrganId"/>
         <result column="DISAB_INFO_ID" property="disabInfoId"/>
         <result column="DISTRICT_PROVINCIAL" property="disableDistrictProvincial"/>
@@ -27,7 +27,6 @@
         <result column="SRV_MODE_NAME" property="svrModelName"/>
         <result column="SRV_ORGAN_NAME" property="svrOrganName"/>
         <result column="PROG_STATUS" property="progStatus"/>
-        <result column="program" property="programDate"/>
         <result column="PROGRAM_EDN_DATE" property="programEndDate"/>
         <result column="PROGRAM_DATE" property="programDate"/>
         <collection property="programSetAndProjectVos" column="{srvOrganId=SRV_ORGAN_ID,programId=PROGRAM_ID}"
@@ -70,7 +69,8 @@
         WHERE T1.PROGRAM_ID = #{programId}
     </select>
     <select id="getProgramDetailWithAdd" resultMap="ProgramSetDetailVoMap">
-        SELECT T1.SRV_ORGAN_ID,
+        SELECT NULL PROGRAM_ID,
+               T1.SRV_ORGAN_ID,
                T1.DISAB_INFO_ID,
                T2.DISTRICT_PROVINCIAL,
                T2.DISTRICT_CITY,
@@ -91,6 +91,7 @@
                T4.FINISH_TIME,
                T7.SRV_MODE_NAME,
                T5.SRV_ORGAN_NAME,
+               NULL PROG_STATUS,
                T1.ALLOT_TIME PROGRAM_DATE,
                T1.STOP_TIME  PROGRAM_EDN_DATE
         FROM CH_SRV_SEND T1