质量问题反馈流程修改

sop-business/src/main/java/com/qmth/sop/business/entity/TDFormWidget.java

@@ -3,10 +3,7 @@ package com.qmth.sop.business.entity;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.qmth.sop.common.base.BaseEntity;
-import com.qmth.sop.common.enums.WidgetCodeEnum;
-import com.qmth.sop.common.enums.WidgetFitEnum;
-import com.qmth.sop.common.enums.WidgetInputTypeEnum;
-import com.qmth.sop.common.enums.WidgetTypeEnum;
+import com.qmth.sop.common.enums.*;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
@@ -92,6 +89,39 @@ public class TDFormWidget extends BaseEntity implements Serializable {
     @ApiModelProperty(value = "选项值，RADIO或CHECKBOX填此值")
     private String options;
 
+    @ApiModelProperty(value = "流程类型，OFFICE_SOP_FLOW：教务处SOP，CLOUD_MARK_SOP_FLOW：研究生SOP，DING_EXCEPTION_FLOW：考勤异常审核流程，PROJECT_EXCHANGE_FLOW：项目计划变更流程，QUALITY_PROBLEM_FLOW：质量问题反馈流程")
+    private TFCustomTypeEnum flowType;
+
+    @ApiModelProperty(value = "表单步骤")
+    private Integer formSetup;
+
+    @ApiModelProperty(value = "处理时限，0：不处理，1：可处理")
+    private Boolean handleTime;
+
+    public TFCustomTypeEnum getFlowType() {
+        return flowType;
+    }
+
+    public void setFlowType(TFCustomTypeEnum flowType) {
+        this.flowType = flowType;
+    }
+
+    public Integer getFormSetup() {
+        return formSetup;
+    }
+
+    public void setFormSetup(Integer formSetup) {
+        this.formSetup = formSetup;
+    }
+
+    public Boolean getHandleTime() {
+        return handleTime;
+    }
+
+    public void setHandleTime(Boolean handleTime) {
+        this.handleTime = handleTime;
+    }
+
     public String getOptions() {
         return options;
     }

sop-business/src/main/resources/db/log/wangliang_update_log.sql

@@ -847,4 +847,14 @@ ALTER TABLE t_f_custom_flow CHANGE COLUMN type type VARCHAR(100)
 
 --2023.8.28update
 ALTER TABLE t_d_form_widget ADD options VARCHAR(500)
-    COMMENT '选项值，RADIO或CHECKBOX填此值' NULL after sub_title;
+    COMMENT '选项值，RADIO或CHECKBOX填此值' NULL after sub_title;
+ALTER TABLE t_d_form_widget ADD flow_type VARCHAR(20)
+    COMMENT '流程类型，OFFICE_SOP_FLOW：教务处SOP，CLOUD_MARK_SOP_FLOW：研究生SOP，DING_EXCEPTION_FLOW：考勤异常审核流程，PROJECT_EXCHANGE_FLOW：项目计划变更流程，QUALITY_PROBLEM_FLOW：质量问题反馈流程' NOT NULL after options;
+ALTER TABLE t_d_form_widget ADD form_setup INTEGER
+    COMMENT '表单步骤' NOT NULL after flow_type;
+ALTER TABLE t_d_form_widget ADD handle TINYINT DEFAULT 0
+    COMMENT '是否可处理，0：不处理，1：可处理' NOT NULL after form_setup;
+ALTER TABLE t_d_form_widget CHANGE COLUMN handle handle_time TINYINT DEFAULT 0
+    COMMENT '处理时限，0：不处理，1：可处理' NOT NULL;
+ALTER TABLE t_d_form_widget CHANGE COLUMN code code VARCHAR(20)
+    COMMENT '编码，TEXT：文本，TEXTAREA：文本域，SELECT：下拉框，RADIO：单选框，CHECKBOX：复选框，DATE：日期，BUTTON：按钮，IMG：图片，VIDEO：视频，AUDIO：音频，FILE：文件，POP_SELECT：弹出选择框，LABEL：标签，TABLE：表格，SIGN：签名，CASCADE_ADDRESS：城市选择控件，OTHER：其它，FORM_GROUP_TITLE：带虚线分割线的标题，ONLE_TITLE：普通标题，独占一行，RADIO_WITH_INPUT：带1个输入框的单选框，DEVICE_IN_TABLE：设备入库表格，DEVICE_OUT_TABLE：设备出库表格' NULL;

sop-common/src/main/java/com/qmth/sop/common/enums/WidgetCodeEnum.java

@@ -39,7 +39,17 @@ public enum WidgetCodeEnum {
 
     SIGN("签名"),
 
-    OTHER("其它");
+    OTHER("其它"),
+
+    FORM_GROUP_TITLE("带虚线分割线的标题"),
+
+    ONLE_TITLE("普通标题，独占一行"),
+
+    RADIO_WITH_INPUT("带1个输入框的单选框"),
+
+    DEVICE_IN_TABLE("设备入库表格"),
+
+    DEVICE_OUT_TABLE("设备出库表格");
 
     private String title;
 

sop-common/src/main/java/com/qmth/sop/common/enums/WidgetInputTypeEnum.java

@@ -25,7 +25,9 @@ public enum WidgetInputTypeEnum {
 
     BIGDECIMAL("精确浮点"),
 
-    FILE("文件");
+    FILE("文件"),
+
+    ARRAY("数组");
 
     private String title;
 

sop-server/src/main/java/com/qmth/sop/server/api/TDFormWidgetController.java

@@ -12,6 +12,7 @@ import com.qmth.sop.business.entity.TDFormWidget;
 import com.qmth.sop.business.entity.TDTableProp;
 import com.qmth.sop.business.service.TDFormWidgetService;
 import com.qmth.sop.common.contant.SystemConstant;
+import com.qmth.sop.common.enums.TFCustomTypeEnum;
 import com.qmth.sop.common.enums.WidgetCodeEnum;
 import com.qmth.sop.common.enums.WidgetTypeEnum;
 import com.qmth.sop.common.util.GsonUtil;
@@ -27,6 +28,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
 import java.util.List;
+import java.util.Objects;
 import java.util.Set;
 import java.util.stream.Collectors;
 
@@ -51,9 +53,14 @@ public class TDFormWidgetController {
     @ApiOperation(value = "流程控件查询")
     @ApiResponses({@ApiResponse(code = 200, message = "流程控件查询", response = FlowFormWidgetResult.class)})
     @RequestMapping(value = "/flow/select", method = RequestMethod.POST)
-    public Result flowSelect(@ApiParam(value = "开始id", required = true) @RequestParam Long beginId,
-                             @ApiParam(value = "结束id", required = true) @RequestParam Long endId) {
-        List<TDFormWidget> tdFormWidgetList = tdFormWidgetService.list(new QueryWrapper<TDFormWidget>().lambda().ge(TDFormWidget::getId, beginId).le(TDFormWidget::getId, endId).eq(TDFormWidget::getType, WidgetTypeEnum.FORM));
+    public Result flowSelect(@ApiParam(value = "流程类型", required = true) @RequestParam TFCustomTypeEnum flowType,
+                             @ApiParam(value = "表单步骤") @RequestParam(required = false) Integer formSetup) {
+        QueryWrapper<TDFormWidget> tdFormWidgetQueryWrapper = new QueryWrapper<>();
+        tdFormWidgetQueryWrapper.lambda().eq(TDFormWidget::getFlowType, flowType).eq(TDFormWidget::getType, WidgetTypeEnum.FORM);
+        if (Objects.nonNull(formSetup)) {
+            tdFormWidgetQueryWrapper.lambda().eq(TDFormWidget::getFormSetup, formSetup);
+        }
+        List<TDFormWidget> tdFormWidgetList = tdFormWidgetService.list(tdFormWidgetQueryWrapper);
         List<FlowFormWidgetResult> flowFormWidgetResultList = null;
         if (!CollectionUtils.isEmpty(tdFormWidgetList)) {
             flowFormWidgetResultList = GsonUtil.fromJson(JacksonUtil.parseJson(tdFormWidgetList), new TypeToken<List<FlowFormWidgetResult>>() {