常用功能

platform-dao/src/main/java/com/platform/dao/dto/custom/CustomFormDTO.java

@@ -87,7 +87,7 @@ public class CustomFormDTO extends BaseDTO implements Serializable {
 
     private String name; // 表单名称
 
-    private Integer status; // 表单状态 0 待发布 1 已发布 2 已废弃
+    private Integer status; // 表单状态 0 废弃 1 正常
 
     private String category; // 分类  category_type  设备 维修 采购 备件 仓库 巡检 点检  保养
 

platform-dao/src/main/java/com/platform/dao/entity/custom/CustomForm.java

@@ -75,7 +75,7 @@ public class CustomForm implements Serializable{
 
     private String name; // 表单名称
 
-    private Integer status; // 表单状态 0 待发布 1 已发布 2 已废弃
+    private Integer status; // 表单状态 0 废弃 1 正常
 
     private String category; // 分类  category_type  设备 维修 采购 备件 仓库 巡检 点检  保养
 }

platform-dao/src/main/java/com/platform/dao/vo/query/custom/CustomFormVO.java

@@ -68,7 +68,7 @@ public class CustomFormVO extends BaseVO implements Serializable {
 
     private String name; // 表单名称
 
-    private Integer status; // 表单状态 0 待发布 1 已发布 2 已废弃
+    private Integer status; // 表单状态 0 废弃 1 正常
 
     private String category; // 分类  category_type  设备 维修 采购 备件 仓库 巡检 点检  保养
 

platform-rest/src/main/java/com/platform/rest/controller/custom/CustomFormController.java

@@ -141,4 +141,10 @@ public class CustomFormController {
         return new R<>(TreeUtil.buildCustomFormTree(forms));
     }
 
+    @SysLog("废弃模板")
+    @PutMapping("/enable/{id}/{status}")
+    public R enableStatus(@PathVariable("id") String id, @PathVariable("status") Integer status) {
+        customFormService.enableStatus(id,status);
+        return new R<>();
+    }
 }

platform-service/src/main/java/com/platform/service/custom/CustomFormService.java

@@ -40,4 +40,6 @@ public interface CustomFormService extends IBaseService<CustomForm, CustomFormDT
 
     CustomFormVO getVOById(String id);
 
+    void enableStatus(String id,Integer status);
+
 }

platform-service/src/main/java/com/platform/service/custom/impl/CustomFormServiceImpl.java

@@ -14,6 +14,7 @@ import com.platform.dao.entity.custom.CustomForm;
 import com.platform.dao.entity.custom.CustomFormBom;
 import com.platform.dao.entity.custom.CustomFormBomField;
 import com.platform.dao.entity.custom.CustomFormData;
+import com.platform.dao.enums.YesNoEnum;
 import com.platform.dao.mapper.custom.CustomFormBomFieldMapper;
 import com.platform.dao.mapper.custom.CustomFormBomMapper;
 import com.platform.dao.mapper.custom.CustomFormDataMapper;
@@ -79,13 +80,15 @@ public class CustomFormServiceImpl extends BaseServiceImpl<CustomFormMapper, Cus
         CustomForm queryForm = new CustomForm();
         queryForm.setCategory(record.getCategory());
         queryForm.setType(record.getType());
+        queryForm.setStatus(YesNoEnum.YES.getValue());
         if(mapper.selectCount(queryForm) > 0){
-            throw new DeniedException("该表单已经存在，可前往修改");
+            throw new DeniedException("该表单已经存在，可前往修改或废弃");
         }
         form.setId(IdGeneratorUtils.getObjectId());
         form.setCreatedTime(LocalDateTime.now());
         form.setCreatedUserId(SecurityUtils.getUserInfo().getUserId());
         form.setCreatedUserName(SecurityUtils.getUserInfo().getRealName());
+        form.setStatus(YesNoEnum.YES.getValue());
         // 查询字段
         if(CollectionUtil.isNotEmpty(record.getQueryFields())){
             List<CustomFormBomField> fields = packageField(form.getId(),record.getQueryFields());
@@ -184,6 +187,14 @@ public class CustomFormServiceImpl extends BaseServiceImpl<CustomFormMapper, Cus
         return vo;
     }
 
+    @Override
+    public void enableStatus(String id, Integer status) {
+        CustomForm form = new CustomForm();
+        form.setId(id);
+        form.setStatus(status);
+        mapper.updateByPrimaryKeySelective(form);
+    }
+
     private List<CustomFieldDTO> transfer(List<CustomFormBomField> fields){
         List<CustomFieldDTO> dtos = new ArrayList<>();
         if(CollectionUtil.isNotEmpty(fields)){

platform-service/src/main/java/com/platform/service/sb/impl/SbInfoServiceImpl.java

@@ -3937,7 +3937,7 @@ public class SbInfoServiceImpl extends BaseServiceImpl<SbInfoMapper, SbInfo, SbI
     @Override
     public Boolean testVal(String id, BigDecimal val,Integer symbol) {
         SbInfo info = mapper.selectByPrimaryKey(id);
-        BigDecimal sbVal = BigDecimalUtil.valueOf(info.getCurrentValue());
+        BigDecimal sbVal = BigDecimalUtil.valueNull(info.getCurrentValue());
         switch (symbol){
             case 0 : // ≠
                 return sbVal.compareTo(val) != 0;

platform-service/src/main/java/com/platform/service/workflow/impl/WorkflowTaskBomServiceImpl.java

@@ -264,7 +264,7 @@ public class WorkflowTaskBomServiceImpl extends BaseServiceImpl<WorkflowTaskBomM
                 Class cla = obj.getClass();
                 Boolean findFlag = Boolean.FALSE; // 符合分支条件
                 try{
-                    Method method = cla.getMethod("");
+                    Method method = cla.getMethod(className.getMethodCode(),String.class,BigDecimal.class,Integer.class);
                     findFlag = (Boolean)method.invoke(obj,primaryKey,val,symbol);
                 }catch (NoSuchMethodException e){
                     e.printStackTrace();