短信库修改，微信库修改接口修改

postdischarge-manage/src/main/java/com/xinelu/manage/mapper/textmessage/TextMessageMapper.java

@@ -5,6 +5,7 @@ import com.xinelu.manage.domain.textmessagesuittask.TextMessageSuitTask;
 import com.xinelu.manage.dto.textmessage.TextMessageDTO;
 import com.xinelu.manage.dto.textmessage.TextMessageTaskDTO;
 import com.xinelu.manage.vo.textmessage.TextMessageVO;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -102,4 +103,26 @@ public interface TextMessageMapper {
      * @return
      */
     int deleteTextMessageSuitTasks(Long[] ids);
+
+    /**
+     * 修改短信模板适用任务类型
+     *
+     * @param task
+     * @return
+     */
+    int updateTextMessageSuitTask(@Param("task") TextMessageSuitTask task);
+
+    /**
+     * 根据textMessageId查询适用任务类型id
+     *
+     * @param textMessageId
+     * @return
+     */
+    List<TextMessageSuitTask> selectTextMessageSuitTask(Long textMessageId);
+
+    /**
+     * 根据id删除之前的适用任务类型
+     * @param id
+     */
+    void deleteTextMessageSuitTask(Long id);
 }

postdischarge-manage/src/main/java/com/xinelu/manage/mapper/wechattemplate/WechatTemplateMapper.java

@@ -111,4 +111,11 @@ public interface WechatTemplateMapper {
      * @return
      */
     int countByWechatTemplateTaskDTO(WechatTemplateTaskDTO wechatTemplateTaskDTO);
+
+    /**
+     * 根据id删除之前存储的适用模板任务类型
+     * @param id
+     */
+    void deleteWechatTemplateSuitTaskById(Long id);
+
 }

postdischarge-manage/src/main/java/com/xinelu/manage/service/textmessage/impl/TextMessageServiceImpl.java

@@ -180,33 +180,23 @@ public class TextMessageServiceImpl implements ITextMessageService {
         if (textMessageMapper.updateTextMessage(textMessage) <= 0) {
             throw new ServiceException("修改短信模板失败");
         }
-
+        // 根据id先删除之前存储的适用模板类型
-        // 批量创建TextMessageSuitTask对象并插入修改
+        textMessageMapper.deleteTextMessageSuitTask(textMessageTaskDTO.getId());
+        // 批量创建TextMessageSuitTask对象并插入
         List<TextMessageSuitTask> tasks = new ArrayList<>();
         for (Long suitTaskTypeId : textMessageTaskDTO.getSuitTaskTypeIds()) {
-            TextMessageSuitTask task = editTextMessageSuitTask(suitTaskTypeId, textMessage.getId(), editUsername, editTime);
+            TextMessageSuitTask task = createTextMessageSuitTask(suitTaskTypeId, textMessage.getId(), editUsername, editTime);
             tasks.add(task);
         }
 
-        // 批量插入TextMessageSuitTask修改记录并检查结果
+        // 批量插入TextMessageSuitTask记录并检查结果
-        if (!tasks.isEmpty() && textMessageMapper.updateTextMessageSuitTasks(tasks) != tasks.size()) {
+        if (!tasks.isEmpty() && textMessageMapper.insertTextMessageSuitTasks(tasks) != tasks.size()) {
             throw new ServiceException("修改短信模板适用任务类型失败");
         }
-
         // 返回成功插入的记录数
         return 1;
     }
 
-    private TextMessageSuitTask editTextMessageSuitTask(Long suitTaskTypeId, Long textMessageId, String updateBy, Date updateAt) {
-        SysDictData sysDictData = sysDictDataMapper.selectDictDataById(suitTaskTypeId);
-        TextMessageSuitTask task = new TextMessageSuitTask();
-        task.setTextMessageId(textMessageId);
-        task.setSuitTaskTypeId(suitTaskTypeId);
-        task.setSuitTaskTypeName(sysDictData.getDictLabel());
-        task.setUpdateBy(updateBy);
-        task.setUpdateTime(updateAt);
-        return task;
-    }
 
     /**
      * 批量删除短信模板信息

postdischarge-manage/src/main/java/com/xinelu/manage/service/wechattemplate/impl/WechatTemplateServiceImpl.java

@@ -5,6 +5,7 @@ import com.xinelu.common.exception.ServiceException;
 import com.xinelu.common.utils.DateUtils;
 import com.xinelu.common.utils.SecurityUtils;
 import com.xinelu.common.utils.bean.BeanUtils;
+import com.xinelu.manage.domain.textmessagesuittask.TextMessageSuitTask;
 import com.xinelu.manage.domain.wechattemplate.WechatTemplate;
 import com.xinelu.manage.domain.wechattemplatesuittask.WechatTemplateSuitTask;
 import com.xinelu.manage.dto.wechattemplate.WechatTemplateDTO;
@@ -164,15 +165,18 @@ public class WechatTemplateServiceImpl implements IWechatTemplateService {
             throw new ServiceException("修改微信模板失败");
         }
 
+        // 根据id删除之前存储的适用模板任务类型
+        wechatTemplateMapper.deleteWechatTemplateSuitTaskById(wechatTemplateTaskDTO.getId());
+
         // 批量创建WechatTemplateSuitTask对象并插入修改
         List<WechatTemplateSuitTask> tasks = new ArrayList<>();
         for (Long suitTaskTypeId : wechatTemplateTaskDTO.getSuitTaskTypeIds()) {
-            WechatTemplateSuitTask task = editWechatTempSuitTask(suitTaskTypeId, wechatTemplate.getId(), editUsername, editTime);
+            WechatTemplateSuitTask task = createWechatTempSuitTask(suitTaskTypeId, wechatTemplate.getId(), editUsername, editTime);
             tasks.add(task);
         }
 
         // 批量插入WechatTemplateSuitTask修改记录并检查结果
-        if (!tasks.isEmpty() && wechatTemplateMapper.updateWechatTemplateSuitTask(tasks) != tasks.size()) {
+        if (!tasks.isEmpty() && wechatTemplateMapper.insertWechatTemplateSuitTask(tasks) != tasks.size()) {
             throw new ServiceException("修改微信模板适用任务类型失败");
         }
 
@@ -180,16 +184,6 @@ public class WechatTemplateServiceImpl implements IWechatTemplateService {
         return 1;
     }
 
-    private WechatTemplateSuitTask editWechatTempSuitTask(Long suitTaskTypeId, Long wechatTempId, String updateBy, Date updateAt) {
-        SysDictData sysDictData = sysDictDataMapper.selectDictDataById(suitTaskTypeId);
-        WechatTemplateSuitTask task = new WechatTemplateSuitTask();
-        task.setWechatTemplateId(wechatTempId);
-        task.setSuitTaskTypeId(suitTaskTypeId);
-        task.setSuitTaskTypeName(sysDictData.getDictLabel());
-        task.setUpdateBy(updateBy);
-        task.setUpdateTime(updateAt);
-        return task;
-    }
 
     /**
      * 批量删除微信模板信息

postdischarge-manage/src/main/resources/mapper/manage/textmessage/TextMessageMapper.xml

@@ -145,6 +145,12 @@
         where department_id = #{departmentId}
           and text_message_name = #{textMessageName}
     </select>
+    <select id="selectTextMessageSuitTask"
+            resultType="com.xinelu.manage.domain.textmessagesuittask.TextMessageSuitTask">
+        select *
+        from text_message_suit_task
+        where text_message_id = #{textMessageId}
+    </select>
 
 
     <insert id="insertTextMessage" parameterType="TextMessage" useGeneratedKeys="true"
@@ -290,6 +296,25 @@
         </foreach>
     </update>
 
+    <update id="updateTextMessageSuitTask">
+        update text_message_suit_task
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="task.suitTaskTypeName != null">suit_task_type_name =
+            #{task.suitTaskTypeName},
+            </if>
+            <if test="task.suitTaskTypeId != null">suit_task_type_id =
+            #{task.suitTaskTypeId},
+            </if>
+            <if test="task.updateBy != null">update_by =
+            #{task.updateBy},
+            </if>
+            <if test="task.updateTime != null">update_time =
+            #{task.updateTime},
+            </if>
+        </trim>
+        where id = #{task.id}
+    </update>
+
     <delete id="deleteTextMessageById" parameterType="Long">
         delete
         from text_message
@@ -305,8 +330,13 @@
     <delete id="deleteTextMessageSuitTasks">
         delete from text_message_suit_task
         where text_message_id in
-        <foreach collection="list" item="id" open="(" separator="," close=")">
+        <foreach collection="array" item="id" open="(" separator="," close=")">
             #{id}
         </foreach>
     </delete>
+    <delete id="deleteTextMessageSuitTask">
+        delete
+        from text_message_suit_task
+        where text_message_id = #{id}
+    </delete>
 </mapper>

postdischarge-manage/src/main/resources/mapper/manage/wechattemplate/WechatTemplateMapper.xml

@@ -21,7 +21,7 @@
         <result property="updateTime" column="update_time"/>
     </resultMap>
 
-    <resultMap id="WechatTemplateVOResultMap" type="com.xinelu.manage.vo.wechattemplate.WechatTemplateVO" >
+    <resultMap id="WechatTemplateVOResultMap" type="com.xinelu.manage.vo.wechattemplate.WechatTemplateVO">
         <id property="id" column="id"/>
         <result column="department_id" property="departmentId"/>
         <result column="department_name" property="departmentName"/>
@@ -33,7 +33,8 @@
         <result column="template_source" property="templateSource"/>
         <result column="template_sort" property="templateSort"/>
         <result column="template_remark" property="templateRemark"/>
-        <collection property="suitTaskList" ofType="com.xinelu.manage.domain.wechattemplatesuittask.WechatTemplateSuitTask">
+        <collection property="suitTaskList"
+                    ofType="com.xinelu.manage.domain.wechattemplatesuittask.WechatTemplateSuitTask">
             <id column="taskId" property="id"/>
             <result column="wechat_template_id" property="wechatTemplateId"/>
             <result column="suit_task_type_id" property="suitTaskTypeId"/>
@@ -131,24 +132,32 @@
         left join wechat_template_suit_task wtst on wt.id = wtst.wechat_template_id
         <where>
             <if test="departmentId != null ">
-                and wt.department_id = #{departmentId}
+                and wt.department_id =
+                #{departmentId}
             </if>
             <if test="wechatTemplateName != null  and wechatTemplateName != ''">
-                and wt.wechat_template_name like concat('%',#{wechatTemplateName},'%')
+                and wt.wechat_template_name like concat('%',
+                #{wechatTemplateName},
+                '%'
+                )
             </if>
             <if test="templateId != null  and templateId != ''">
-                and wt.template_id like concat('%',#{templateId},'%')
+                and wt.template_id like concat('%',
+                #{templateId},
+                '%'
+                )
             </if>
             <if test="templateSource != null  and templateSource != ''">
-                and wt.template_source = #{templateSource}
+                and wt.template_source =
+                #{templateSource}
             </if>
         </where>
     </select>
     <select id="selectWechatTemplateDtoById" resultMap="WechatTemplateVOResultMap">
-        select wt.id ,
+        select wt.id,
                wt.department_id,
-               wt.department_name ,
+               wt.department_name,
-               wt.disease_type_id ,
+               wt.disease_type_id,
                wt.disease_type_name,
                wt.wechat_template_name,
                wt.template_id,
@@ -324,8 +333,13 @@
         delete
         from wechat_template_suit_task
         where wechat_template_id in
-        <foreach collection="list" item="id" open="(" separator="," close=")">
+        <foreach collection="array" item="id" open="(" separator="," close=")">
             #{id}
         </foreach>
     </delete>
+    <delete id="deleteWechatTemplateSuitTaskById">
+        delete
+        from wechat_template_suit_task
+        where wechat_template_id = #{id}
+    </delete>
 </mapper>