审批汇总删除功能修改为逻辑删除

src/main/java/cn/timer/api/bean/spmk/SpmkApproveSummary.java

@@ -86,7 +86,9 @@ public class SpmkApproveSummary extends Model<SpmkApproveSummary> {
 
 
 	@ApiModelProperty(value = "摘要 ", example = "摘要")
 	@ApiModelProperty(value = "摘要 ", example = "摘要")
 	private String digest;
 	private String digest;
-	
+
+	@ApiModelProperty(value = "是否删除", example = "0-否  1-是")
+	private Integer isDelete;
 	
 	
 	@ApiModelProperty(value = "岗位名称", example = "岗位名称")
 	@ApiModelProperty(value = "岗位名称", example = "岗位名称")
 	private String gwName;
 	private String gwName;

src/main/java/cn/timer/api/controller/spmk/SpmkController.java

@@ -945,6 +945,7 @@ public class SpmkController {
 	@ApiOperationSupport(order = 23)
 	@ApiOperationSupport(order = 23)
 	@Log(title = "审批-删除审批", businessType = BusinessType.DELETE)
 	@Log(title = "审批-删除审批", businessType = BusinessType.DELETE)
 	public Result<Object> deleteApprovalData(@PathVariable Integer id){
 	public Result<Object> deleteApprovalData(@PathVariable Integer id){
+		/*
 		List<SpmkApproveExecuteRecord> listAer = spmkApproveExecuteRecordMapper.selectList(new QueryWrapper<SpmkApproveExecuteRecord>()
 		List<SpmkApproveExecuteRecord> listAer = spmkApproveExecuteRecordMapper.selectList(new QueryWrapper<SpmkApproveExecuteRecord>()
 				.lambda()
 				.lambda()
 				.select(SpmkApproveExecuteRecord::getId)
 				.select(SpmkApproveExecuteRecord::getId)
@@ -960,7 +961,9 @@ public class SpmkController {
 		spmkApproveDetailSummaryMapper.delete(new QueryWrapper<SpmkApproveDetailSummary>().lambda().eq(SpmkApproveDetailSummary::getApproveSummaryId,id));
 		spmkApproveDetailSummaryMapper.delete(new QueryWrapper<SpmkApproveDetailSummary>().lambda().eq(SpmkApproveDetailSummary::getApproveSummaryId,id));
 
 
 		spmkApproveSummaryMapper.delete(new QueryWrapper<SpmkApproveSummary>().lambda().eq(SpmkApproveSummary::getId, id));
 		spmkApproveSummaryMapper.delete(new QueryWrapper<SpmkApproveSummary>().lambda().eq(SpmkApproveSummary::getId, id));
-
+		*/
+		//逻辑删除
+		SpmkApproveSummary.builder().id(id).isDelete(1).build().updateById();
 		return ResultUtil.success();
 		return ResultUtil.success();
 	}
 	}
 
 

src/main/resources/mapping/spmk/SpmkApproveSummaryMapper.xml

@@ -20,6 +20,7 @@
                 <result column="update_time" property="updateTime" />
                 <result column="update_time" property="updateTime" />
                 <result column="end_time" property="endTime" />
                 <result column="end_time" property="endTime" />
                 <result column="digest" property="digest" />
                 <result column="digest" property="digest" />
+                <result column="is_delete" property="isDelete" />
     </resultMap>
     </resultMap>
     
     
     <resultMap id="BaseResultMap_As" type="cn.timer.api.bean.spmk.SpmkApproveSummary" >
     <resultMap id="BaseResultMap_As" type="cn.timer.api.bean.spmk.SpmkApproveSummary" >
@@ -38,6 +39,7 @@
                 <result column="update_time" property="updateTime" />
                 <result column="update_time" property="updateTime" />
                 <result column="end_time" property="endTime" />
                 <result column="end_time" property="endTime" />
                 <result column="digest" property="digest" />
                 <result column="digest" property="digest" />
+                <result column="is_delete" property="isDelete" />
                 <result column="gw_name" property="gwName" />
                 <result column="gw_name" property="gwName" />
                 <result column="bm_id" property="bmId" />
                 <result column="bm_id" property="bmId" />
                 <result column="bm_name" property="bmName" />
                 <result column="bm_name" property="bmName" />
@@ -58,7 +60,8 @@
                 asso_type,
                 asso_type,
                 update_time,
                 update_time,
                 end_time,
                 end_time,
-                digest
+                digest,
+                is_delete
     </sql>
     </sql>
     
     
     <sql id="Base_Column_List_a">
     <sql id="Base_Column_List_a">
@@ -76,7 +79,8 @@
                 a.asso_type,
                 a.asso_type,
                 a.update_time,
                 a.update_time,
                 a.end_time,
                 a.end_time,
-                a.digest
+                a.digest,
+                a.is_delete
     </sql>
     </sql>
     
     
     <sql id="Base_Column_List_Alias">
     <sql id="Base_Column_List_Alias">
@@ -104,7 +108,7 @@
 			(SELECT id FROM zzgl_bmgw_m WHERE id = (SELECT up_id FROM zzgl_bmgw_m WHERE id = (SELECT bmgw_id FROM yggl_main_emp WHERE a.emp_num = emp_num and a.org_code=org_code limit 1) limit 1) limit 1) as bm_id,
 			(SELECT id FROM zzgl_bmgw_m WHERE id = (SELECT up_id FROM zzgl_bmgw_m WHERE id = (SELECT bmgw_id FROM yggl_main_emp WHERE a.emp_num = emp_num and a.org_code=org_code limit 1) limit 1) limit 1) as bm_id,
 			(SELECT name FROM zzgl_bmgw_m WHERE id = (SELECT up_id FROM zzgl_bmgw_m WHERE id = (SELECT bmgw_id FROM yggl_main_emp WHERE a.emp_num = emp_num and a.org_code=org_code limit 1) limit 1) limit 1) as bm_name
 			(SELECT name FROM zzgl_bmgw_m WHERE id = (SELECT up_id FROM zzgl_bmgw_m WHERE id = (SELECT bmgw_id FROM yggl_main_emp WHERE a.emp_num = emp_num and a.org_code=org_code limit 1) limit 1) limit 1) as bm_name
         FROM spmk_approve_summary a
         FROM spmk_approve_summary a
-        WHERE a.org_code = #{param.orgCode} 
+        WHERE a.org_code = #{param.orgCode}  and a.is_delete = 0
         	<if test="param.query != null and param.query != ''">
         	<if test="param.query != null and param.query != ''">
         		and (
         		and (
         			a.title like CONCAT('%',#{param.query},'%') or
         			a.title like CONCAT('%',#{param.query},'%') or
@@ -139,7 +143,7 @@
 			(SELECT id FROM zzgl_bmgw_m WHERE id = (SELECT up_id FROM zzgl_bmgw_m WHERE id = (SELECT bmgw_id FROM yggl_main_emp WHERE a.emp_num = emp_num limit 1) limit 1) limit 1) as bm_id,
 			(SELECT id FROM zzgl_bmgw_m WHERE id = (SELECT up_id FROM zzgl_bmgw_m WHERE id = (SELECT bmgw_id FROM yggl_main_emp WHERE a.emp_num = emp_num limit 1) limit 1) limit 1) as bm_id,
 			(SELECT name FROM zzgl_bmgw_m WHERE id = (SELECT up_id FROM zzgl_bmgw_m WHERE id = (SELECT bmgw_id FROM yggl_main_emp WHERE a.emp_num = emp_num limit 1) limit 1) limit 1) as bm_name
 			(SELECT name FROM zzgl_bmgw_m WHERE id = (SELECT up_id FROM zzgl_bmgw_m WHERE id = (SELECT bmgw_id FROM yggl_main_emp WHERE a.emp_num = emp_num limit 1) limit 1) limit 1) as bm_name
         FROM spmk_approve_summary a
         FROM spmk_approve_summary a
-        WHERE a.org_code = #{param.orgCode} 
+        WHERE a.org_code = #{param.orgCode}  and  a.is_delete=0
         
         
         	<if test="param.type != null and param.type >= 1">
         	<if test="param.type != null and param.type >= 1">
         	and a.id in 
         	and a.id in