Pārlūkot izejas kodu

sop列表接口修改

wangliang 1 gadu atpakaļ
vecāks
revīzija
159412ee5f

+ 17 - 6
sop-business/src/main/java/com/qmth/sop/business/bean/params/SopInfoListParam.java

@@ -31,8 +31,11 @@ public class SopInfoListParam extends TBSopInfo implements Serializable {
     @ApiModelProperty(value = "版本号")
     private Integer version = 1;
 
-    @ApiModelProperty(value = "元数据数组")
-    private List<FormWidgetMetadataParam> formWidgetMetadataList;
+    @ApiModelProperty(value = "元数据显示字段数组")
+    private List<FormWidgetMetadataParam> formWidgetMetadataViewList;
+
+    @ApiModelProperty(value = "元数据筛选字段数组")
+    private List<FormWidgetMetadataParam> formWidgetMetadataConditionList;
 
     @ApiModelProperty(value = "页码")
     @NotNull(message = "页码不能为空")
@@ -76,12 +79,20 @@ public class SopInfoListParam extends TBSopInfo implements Serializable {
         this.version = version;
     }
 
-    public List<FormWidgetMetadataParam> getFormWidgetMetadataList() {
-        return formWidgetMetadataList;
+    public List<FormWidgetMetadataParam> getFormWidgetMetadataViewList() {
+        return formWidgetMetadataViewList;
+    }
+
+    public void setFormWidgetMetadataViewList(List<FormWidgetMetadataParam> formWidgetMetadataViewList) {
+        this.formWidgetMetadataViewList = formWidgetMetadataViewList;
+    }
+
+    public List<FormWidgetMetadataParam> getFormWidgetMetadataConditionList() {
+        return formWidgetMetadataConditionList;
     }
 
-    public void setFormWidgetMetadataList(List<FormWidgetMetadataParam> formWidgetMetadataList) {
-        this.formWidgetMetadataList = formWidgetMetadataList;
+    public void setFormWidgetMetadataConditionList(List<FormWidgetMetadataParam> formWidgetMetadataConditionList) {
+        this.formWidgetMetadataConditionList = formWidgetMetadataConditionList;
     }
 
     public Integer getPageNumber() {

Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 46 - 12
sop-business/src/main/java/com/qmth/sop/business/service/impl/TBSopInfoServiceImpl.java


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

@@ -1140,4 +1140,8 @@ ALTER TABLE t_d_form_widget CHANGE COLUMN handle_time handle TINYINT DEFAULT 0
 
 UPDATE sys_privilege
 SET name='重启', url='Restart', `type`='LINK', parent_id=47, `sequence`=3, property='AUTH', related='1016', enable=1, default_auth=0, front_display=1
-WHERE id=202;
+WHERE id=202;
+
+UPDATE sys_privilege
+SET name='考勤明细查询', url='dingDetail', `type`='MENU', parent_id=25, `sequence`=1, property=NULL, related='1041,1042,1043', enable=1, default_auth=0, front_display=1
+WHERE id=1044;

Daži faili netika attēloti, jo izmaiņu fails ir pārāk liels