修改服务方案相关接口、服务人员实体类生成

common/common-core/src/main/java/com/hungraim/ltc/pojo/entity/serviceManage/ChEmpType.java

+package com.hungraim.ltc.pojo.entity.serviceManage;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * CH_EMP_TYPE
+ * @author 
+ */
+@Data
+@TableName("CH_EMP_TYPE")
+@KeySequence("SEQ_CH_EMP_TYPE")
+public class ChEmpType implements Serializable {
+    /**
+     * 类型id
+     */
+    @TableId(type = IdType.INPUT)
+    private Long empType;
+
+    /**
+     * 类型NAME
+     */
+    private String empTypeName;
+
+    private static final long serialVersionUID = 1L;
+}
\ No newline at end of file

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

@@ -30,7 +30,7 @@ public class ProgramSetAndProjectVo {
     /**
      * 类服务包类型(1基础护理、2日常照护项目、3其它、4巡诊)
      */
-    private Short categoryType;
+    private Integer categoryType;
 
     /**
      * 频次
@@ -40,7 +40,7 @@ public class ProgramSetAndProjectVo {
     /**
      * 频次类型(1:次/每月，2:必要时）
      */
-    private Short itemTimesType;
+    private Integer itemTimesType;
 
     /**
      * 单价
@@ -50,7 +50,7 @@ public class ProgramSetAndProjectVo {
     /**
      * 是否必需项(是：1；否：0)
      */
-    private Short isNeed;
+    private Integer isNeed;
 
     /**
      * 备注

governance/src/main/java/com/hungraim/ltc/governance/dao/ChEmpTypeMapper.java

+package com.hungraim.ltc.governance.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.hungraim.ltc.pojo.entity.serviceManage.ChEmpType;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+@Mapper
+@Repository
+public interface ChEmpTypeMapper extends BaseMapper<ChEmpType> {
+}
\ No newline at end of file

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

+<?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.hungraim.ltc.governance.dao.ChEmpTypeMapper">
+  <resultMap id="BaseResultMap" type="com.hungraim.ltc.pojo.entity.serviceManage.ChEmpType">
+    <id column="EMP_TYPE" jdbcType="DECIMAL" property="empType" />
+    <result column="EMP_TYPE_NAME" jdbcType="VARCHAR" property="empTypeName" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    EMP_TYPE, EMP_TYPE_NAME
+  </sql>
+</mapper>
\ No newline at end of file

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

@@ -32,17 +32,38 @@
     <resultMap id="organProjectsMap" type="com.hungraim.ltc.pojo.vo.governance.ProgramSetAndProjectVo">
         <id column="PROJECT_ID" property="projectId"/>
         <result column="SRV_ORGAN_ID" property="srvOrganId"/>
+        <result column="SET_ID" property="setId"/>
         <result column="ITEM_NAME" property="itemName"/>
         <result column="CATEGORY_TYPE" property="categoryType"/>
         <result column="SRV_ORGAN_ID" property="itemTimes"/>
         <result column="ITEM_TIMES_TYPE" property="itemTimesType"/>
         <result column="ITEM_PRICE" property="itemPrice"/>
-        <result column="IS_CONF" property="isNeed"/>
+        <result column="IS_NEED" property="isNeed"/>
+        <result column="PLANNING_FREQUENCY" property="planningFrequency"/>
+        <result column="PLANNING_FREQUENCY_TYPE" property="planningFrequencyType"/>
     </resultMap>
 
     <select id="selectOrganProjectsBySrvOrganId" resultMap="organProjectsMap">
-        SELECT *
+        SELECT
+        PROJECT_ID,
+        SRV_ORGAN_ID,
+        ITEM_NAME,
+        CATEGORY_TYPE,
+        CH_SRV_ORGAN_PROJECT.ITEM_TIMES,
+        ITEM_TIMES_TYPE,
+        CH_SRV_ORGAN_PROJECT.ITEM_PRICE,
+        CH_SRV_ORGAN_PROJECT.IS_CONF IS_NEED
+        <if test="programId != null">
+            ,
+            SET_ID,
+            PLANNING_FREQUENCY,
+            PLANNING_FREQUENCY_TYPE,
+            CH_SRV_PROGRAM_SET.REMARK
+        </if>
         FROM CH_SRV_ORGAN_PROJECT
+        <if test="programId != null">
+            LEFT JOIN CH_SRV_PROGRAM_SET ON ITEM_ID = PROJECT_ID AND PROGRAM_ID = #{programId}
+        </if>
         WHERE SRV_ORGAN_ID = #{srvOrganId}
         AND STATUS = 0
     </select>

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

@@ -30,7 +30,7 @@
         <result column="program" property="programDate"/>
         <result column="PROGRAM_EDN_DATE" property="programEndDate"/>
         <result column="PROGRAM_DATE" property="programDate"/>
-        <collection property="programSetAndProjectVos" column="SRV_ORGAN_ID"
+        <collection property="programSetAndProjectVos" column="{srvOrganId=SRV_ORGAN_ID,programId=PROGRAM_ID}"
                     select="com.hungraim.ltc.governance.dao.ChSrvOrganProjectMapper.selectOrganProjectsBySrvOrganId"/>
     </resultMap>
     <select id="getProgramDetail" resultMap="ProgramSetDetailVoMap">