Browse Source

成本报表 添加删除重制

liuchaohui 1 year ago
parent
commit
e03bf3b131

+ 9 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/cost/controller/SyCostAllocationController.java

@@ -464,6 +464,15 @@ public class SyCostAllocationController {
                     syCostJson.setRejectDate(dtActionTime);
                     syCostJson.setStatus("返单");
                     syCostJsonService.updateById(syCostJson);
+                }else if ("删除".equalsIgnoreCase(action)){
+                    syCostJson.setFirstApproveBy(null);
+                    syCostJson.setFirstApproveDate(null);
+                    syCostJson.setSubmitBy(null);
+                    syCostJson.setSubmitDate(null);
+                    syCostJson.setRejectBy(null);
+                    syCostJson.setRejectDate(null);
+                    syCostJson.setStatus("保存");
+                    syCostJsonService.updateById(syCostJson);
                 }
             }
             result.success("");

+ 7 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/cost/entity/SyCostJson.java

@@ -32,6 +32,13 @@ import java.util.Date;
 @ApiModel(value="sy_cost_json对象", description="成本分配存储json")
 public class SyCostJson implements Serializable {
 
+    private static final long serialVersionUID = 1L;
+
+    /**主键*/
+    @TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private String id;
+
     /**计划单号*/
     @ApiModelProperty(value = "计划单号")
     private String planNum;