Merge branch 'dev' of http://39.96.70.20:8080/A7/aroad into dev

src/main/java/com/elephant/framework/galaxy/aroad/module/info/controller/InfoTemplatesController.java

@@ -76,7 +76,7 @@ public class InfoTemplatesController extends BaseController  {
   @SysLog("删除信息模板表")
   @DeleteMapping("/{templateId}")
   public R removeById(@PathVariable Integer templateId){
-    return new R<>(infoTemplatesService.removeById(templateId));
+    return new R<>(infoTemplatesService.del(templateId));
   }
 
 }

src/main/java/com/elephant/framework/galaxy/aroad/module/info/mapper/InfoTemplatesMapper.java

@@ -24,4 +24,13 @@ public interface InfoTemplatesMapper extends BaseMapper<InfoTemplates> {
     * @Date: 2019/4/30 
     */ 
     IPage<InfoTemplates> getInfoTemplatePage(Page page, Integer createDeptId);
+
+    /**
+     * @Description:  假删除信息模板
+     * @Param: [templateId]
+     * @return: boolean
+     * @Author: songwenjie
+     * @Date: 2019/5/7
+     */
+    boolean del(int templateId);
 }

src/main/java/com/elephant/framework/galaxy/aroad/module/info/service/InfoTemplatesService.java

@@ -21,4 +21,13 @@ public interface InfoTemplatesService extends IService<InfoTemplates> {
      * @Date: 2019/4/30
      */
     IPage<InfoTemplates> getInfoTemplatePage(Page page, Integer createDeptId);
+
+    /**
+     * @Description:  假删除信息模板
+     * @Param: [templateId]
+     * @return: boolean
+     * @Author: songwenjie
+     * @Date: 2019/5/7
+     */
+    boolean del(int templateId);
 }

src/main/java/com/elephant/framework/galaxy/aroad/module/info/service/impl/InfoTemplatesServiceImpl.java

@@ -27,4 +27,15 @@ public class InfoTemplatesServiceImpl extends ServiceImpl<InfoTemplatesMapper, I
     public IPage<InfoTemplates> getInfoTemplatePage(Page page, Integer createDeptId){
         return baseMapper.getInfoTemplatePage(page,createDeptId);
     }
+
+    /**
+     * @Description:  假删除信息模板
+     * @Param: [templateId]
+     * @return: boolean
+     * @Author: songwenjie
+     * @Date: 2019/5/7
+     */
+    public boolean del(int templateId){
+        return baseMapper.del(templateId);
+    }
 }

src/main/resources/mapper/info/InfoInformationsMapper.xml

@@ -44,7 +44,7 @@
         t.template_name,t.template_type,
         r.receiver_id,r.receiver_name
       from `info_templates` t
-      inner join
+      right join
         info_informations i
       on t.template_id = i.template_id
       inner join
@@ -60,7 +60,7 @@
         t.template_name,t.template_type,
         r.receiver_id,group_concat(r.receiver_name) as receiver_name
       from `info_templates` t
-      inner join
+      right join
         info_informations i
       on t.template_id = i.template_id
       inner join

src/main/resources/mapper/info/InfoTemplatesMapper.xml

@@ -17,7 +17,11 @@
   <select id="getInfoTemplatePage" resultMap="infoTemplatesMap">
     select * from info_templates
     where create_dept_id = #{createDeptId}
+    and is_del = 0
   </select>
 
-
+  <!--假删除信息模板-->
+  <update id="del">
+    update info_templates set is_del=1 where template_id = #{templateId}
+  </update>
 </mapper>