根据id删除wages_conversion_data的数据

ruoyi-supplies/src/main/java/com/ruoyi/system/mapper/ActSuppliesCleaningRuleMapper.java

@@ -42,4 +42,6 @@ public interface ActSuppliesCleaningRuleMapper
     List<ActSuppliesImportCleaningAcc> selectActSuppliesCleaningCopy(Long id);
 
     void insert(@Param("accList") List<ActSuppliesImportCleaningAcc> cleaningAccList);
+
+    void deleteByMineIdAndDateColumn(@Param("mineId") String mineId, @Param("dateColumn") String dateColumn);
 }

ruoyi-supplies/src/main/java/com/ruoyi/system/service/impl/ActSuppliesMaterialServiceImpl.java

@@ -44,6 +44,7 @@ public class ActSuppliesMaterialServiceImpl implements ActSuppliesMaterialServic
             String dateColumn = part[1];
             //执行删除操作
             actSuppliesMaterialMapper.delete(mineId, dateColumn);
+            actSuppliesCleaningRuleMapper.deleteByMineIdAndDateColumn(mineId,dateColumn);
         }
         List<ActSuppliesImportCleaningAcc> cleaningAccList = new ArrayList<>();
         for (ActSuppliesMaterialDetails material : materials) {
@@ -64,6 +65,7 @@ public class ActSuppliesMaterialServiceImpl implements ActSuppliesMaterialServic
                 cleaningAccList.add(cleaningAcc);
             }
         }
+
         actSuppliesCleaningRuleMapper.insert(cleaningAccList);
         Boolean saved = actSuppliesMaterialMapper.save(materials);
         if (!saved) {

ruoyi-supplies/src/main/resources/mapper/system/ActSuppliesCleaningRuleMapper.xml

@@ -674,6 +674,12 @@
         where yy_uuid = #{importUuid}
     </delete>
 
+    <delete id="deleteByMineIdAndDateColumn">
+        delete
+        from act_supplies_import_cleaning_copy1
+        where ssk_id =#{mineId} and hdate = #{dateColumn}
+    </delete>
+
     <insert id="addInsertConvertAcc" parameterType="ActSuppliesImportTable" useGeneratedKeys="true" keyProperty="id">
         insert into act_supplies_import_table_copy1
         <trim prefix="(" suffix=")" suffixOverrides=",">

ruoyi-wages/src/main/java/com/ruoyi/system/controller/WagesConversionController.java

@@ -56,6 +56,12 @@ public class WagesConversionController extends BaseController {
         return new AjaxResult(200, "成功", wagesConversionService.selectWagesConversionDataById(id));
     }
 
+    @DeleteMapping("/deleteWagesDataById/{id}")
+    public AjaxResult deleteWagesDataById(@PathVariable("id") int id){
+        wagesConversionService.deleteWagesDataById(id);
+        return AjaxResult.success("删除成功");
+    }
+
     @GetMapping("/recentFormulas/{id}")
     public AjaxResult recentFormulas(@PathVariable("id") String mineId) {
         return wagesConversionService.recentFormulas(mineId);

ruoyi-wages/src/main/java/com/ruoyi/system/mapper/WagesConversionMapper.java

@@ -24,4 +24,6 @@ public interface WagesConversionMapper {
     void deleteFromConversionToDate(@Param("date") String yearMonth);
 
     List<WagesConversionDataVO> selectWagesValueAndDate(@Param("id") String mineId);
+
+    void deleteWagesDataById(int id);
 }

ruoyi-wages/src/main/java/com/ruoyi/system/service/WagesConversionService.java

@@ -21,4 +21,6 @@ public interface WagesConversionService {
     WagesConversionData selectWagesConversionDataById(int id);
 
     AjaxResult recentFormulas(String mineId);
+
+    void deleteWagesDataById(int id);
 }

ruoyi-wages/src/main/java/com/ruoyi/system/service/impl/WagesConversionServiceImpl.java

@@ -71,4 +71,9 @@ public class WagesConversionServiceImpl implements WagesConversionService {
         return new AjaxResult(500, "数据库中数据错误", null);
     }
 
+    @Override
+    public void deleteWagesDataById(int id) {
+        wagesConversionMapper.deleteWagesDataById(id);
+    }
+
 }

ruoyi-wages/src/main/resources/mapper/system/WagesConversionMapper.xml

@@ -24,6 +24,10 @@
         from wages_conversion_data
         where wage_month = #{date};
     </delete>
+    <delete id="deleteWagesDataById" parameterType="int">
+        delete from wages_conversion_data
+        where id = #{id}
+    </delete>
 
     <select id="selectWagesConversionDataList" resultMap="WagesConversionData">
         select id, if_generate_voucher, wage_month, create_date, update_date,mine_id