民生诉求

zhsq_qk-admin/src/main/java/zhsq_qk/web/controller/system/QkPeopleAppealController.java

@@ -62,7 +62,8 @@ public class QkPeopleAppealController extends BaseController {
     @Log(title = "民生诉求", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody QkPeopleAppeal qkPeopleAppeal) {
-        return toAjax(qkPeopleAppealService.insertQkPeopleAppeal(qkPeopleAppeal));
+        qkPeopleAppealService.insertQkPeopleAppeal(qkPeopleAppeal);
+        return success();
     }
 
     /**

zhsq_qk-system/src/main/java/zhsq_qk/system/mapper/QkPeopleAppealImgMapper.java

@@ -1,5 +1,6 @@
 package zhsq_qk.system.mapper;
 
+import org.apache.ibatis.annotations.Param;
 import zhsq_qk.system.domain.QkPeopleAppealImg;
 
 import java.util.List;
@@ -59,5 +60,7 @@ public interface QkPeopleAppealImgMapper {
      */
     public int deleteQkPeopleAppealImgByIds(Long[] ids);
 
-    int insertPeopleAppealImgList(List<QkPeopleAppealImg> images);
+    void insertPeopleAppealImgList(List<QkPeopleAppealImg> images);
+
+    void deleteQkPeopleAppealImgByAppealId(@Param("appealId") Long appealId);
 }

zhsq_qk-system/src/main/java/zhsq_qk/system/service/IQkPeopleAppealService.java

@@ -1,5 +1,6 @@
 package zhsq_qk.system.service;
 
+import zhsq_qk.common.core.domain.AjaxResult;
 import zhsq_qk.system.domain.QkPeopleAppeal;
 
 import java.util.List;
@@ -33,7 +34,7 @@ public interface IQkPeopleAppealService {
      * @param qkPeopleAppeal 民生诉求
      * @return 结果
      */
-    public int insertQkPeopleAppeal(QkPeopleAppeal qkPeopleAppeal);
+    public void insertQkPeopleAppeal(QkPeopleAppeal qkPeopleAppeal);
 
     /**
      * 修改民生诉求

zhsq_qk-system/src/main/java/zhsq_qk/system/service/impl/QkPeopleAppealServiceImpl.java

@@ -55,11 +55,11 @@ public class QkPeopleAppealServiceImpl implements IQkPeopleAppealService {
      * @return 结果
      */
     @Override
-    public int insertQkPeopleAppeal(QkPeopleAppeal qkPeopleAppeal) {
+    public void insertQkPeopleAppeal(QkPeopleAppeal qkPeopleAppeal) {
         qkPeopleAppeal.setCreateTime(DateUtils.getNowDate());
         qkPeopleAppealMapper.insertQkPeopleAppeal(qkPeopleAppeal);
         List<QkPeopleAppealImg> images = new ArrayList<>();
-        if (StringUtils.isNotEmpty(qkPeopleAppeal.getAppearImages())){
+        if (StringUtils.isNotEmpty(qkPeopleAppeal.getAppearImages())) {
             for (String file : qkPeopleAppeal.getAppearImages().split(",")) {
                 QkPeopleAppealImg image = new QkPeopleAppealImg();
                 image.setImgUrl(file);
@@ -67,13 +67,9 @@ public class QkPeopleAppealServiceImpl implements IQkPeopleAppealService {
                 images.add(image);
             }
         }
-
         if (!images.isEmpty()) {
-            return    qkPeopleAppealImgMapper.insertPeopleAppealImgList(images);
-        }else {
-            return
+            qkPeopleAppealImgMapper.insertPeopleAppealImgList(images);
         }
-
     }
 
     /**
@@ -85,6 +81,19 @@ public class QkPeopleAppealServiceImpl implements IQkPeopleAppealService {
     @Override
     public int updateQkPeopleAppeal(QkPeopleAppeal qkPeopleAppeal) {
         qkPeopleAppeal.setUpdateTime(DateUtils.getNowDate());
+        qkPeopleAppealImgMapper.deleteQkPeopleAppealImgByAppealId(qkPeopleAppeal.getId());
+        List<QkPeopleAppealImg> images = new ArrayList<>();
+        if (StringUtils.isNotEmpty(qkPeopleAppeal.getAppearImages())) {
+            for (String file : qkPeopleAppeal.getAppearImages().split(",")) {
+                QkPeopleAppealImg image = new QkPeopleAppealImg();
+                image.setImgUrl(file);
+                image.setAppealId(qkPeopleAppeal.getId());
+                images.add(image);
+            }
+        }
+        if (!images.isEmpty()) {
+            qkPeopleAppealImgMapper.insertPeopleAppealImgList(images);
+        }
         return qkPeopleAppealMapper.updateQkPeopleAppeal(qkPeopleAppeal);
     }
 
@@ -96,6 +105,9 @@ public class QkPeopleAppealServiceImpl implements IQkPeopleAppealService {
      */
     @Override
     public int deleteQkPeopleAppealByIds(Long[] ids) {
+        for (Long id : ids) {
+            qkPeopleAppealImgMapper.deleteQkPeopleAppealImgByAppealId(id);
+        }
         return qkPeopleAppealMapper.deleteQkPeopleAppealByIds(ids);
     }
 

zhsq_qk-system/src/main/resources/mapper/system/QkPeopleAppealImgMapper.xml

@@ -90,4 +90,9 @@
             )
         </foreach>
     </insert>
+
+    <delete id="deleteQkPeopleAppealImgByAppealId" parameterType="Long">
+        delete
+        from qk_people_appeal_img where appeal_id = #{appealId}
+    </delete>
 </mapper>

zhsq_qk-system/src/main/resources/mapper/system/QkPeopleAppealMapper.xml

@@ -76,8 +76,21 @@
 
     <select id="selectQkPeopleAppealById" parameterType="Long"
             resultMap="QkPeopleAppealResult">
-        <include refid="selectQkPeopleAppealVo"/>
-        where id = #{id}
+        select pa.id,
+               appeal_name,
+               appeal_describe,
+               appear_time,
+               appear_user_id,
+               appear_user_name,
+               appear_phone,
+               appear_address,
+               even_type,
+               status,
+               remark,
+               GROUP_CONCAT(pai.img_url) as appearImages
+        from qk_people_appeal pa
+        left join qk_people_appeal_img pai on pa.id = pai.appeal_id
+        where pa.id = #{id}
     </select>
 
     <insert id="insertQkPeopleAppeal" parameterType="QkPeopleAppeal" useGeneratedKeys="true"