csg6 10 months ago
parent
commit
18b36c9cc1

+ 4 - 4
ruoyi-postcheck/src/main/java/com/ruoyi/postCheck/controller/PostCheckedProblemController.java

@@ -54,7 +54,7 @@ public class PostCheckedProblemController extends BaseController {
54
             @ApiImplicitParam(name = "problemLevel", value = "问题等级(一般、重要)", dataType = "String", dataTypeClass = String.class),
54
             @ApiImplicitParam(name = "problemLevel", value = "问题等级(一般、重要)", dataType = "String", dataTypeClass = String.class),
55
             @ApiImplicitParam(name = "dutyType", value = "职责类别:1-业务职责;2-党建及党风廉政;3-安全环保职责;4-合规保密职;", dataType = "Integer", dataTypeClass = Integer.class),
55
             @ApiImplicitParam(name = "dutyType", value = "职责类别:1-业务职责;2-党建及党风廉政;3-安全环保职责;4-合规保密职;", dataType = "Integer", dataTypeClass = Integer.class),
56
             @ApiImplicitParam(name = "problemAttribute", value = "问题属性(完整问题、有效性问题、适宜性问题)", dataType = "String", dataTypeClass = String.class),
56
             @ApiImplicitParam(name = "problemAttribute", value = "问题属性(完整问题、有效性问题、适宜性问题)", dataType = "String", dataTypeClass = String.class),
57
-            @ApiImplicitParam(name = "problemCategory", value = "问题类别(职责权限问题、工作内容问题、工作标准问题、考核奖励问题、考核奖励问题、任职资格问题、其他)", dataType = "String", dataTypeClass = String.class),
57
+            @ApiImplicitParam(name = "problemCategory", value = "问题类别(职责权限问题、工作内容问题、工作标准问题、考核奖励问题、任职资格问题、其他)", dataType = "String", dataTypeClass = String.class),
58
             @ApiImplicitParam(name = "description", value = "问题描述", dataType = "String", dataTypeClass = String.class),
58
             @ApiImplicitParam(name = "description", value = "问题描述", dataType = "String", dataTypeClass = String.class),
59
             @ApiImplicitParam(name = "problemCause", value = "问题原因", dataType = "String", dataTypeClass = String.class),
59
             @ApiImplicitParam(name = "problemCause", value = "问题原因", dataType = "String", dataTypeClass = String.class),
60
             @ApiImplicitParam(name = "isImmediatelyCorrected", value = "是否立行立改(1-Yes;2-No;)", dataType = "Integer", dataTypeClass = Integer.class),
60
             @ApiImplicitParam(name = "isImmediatelyCorrected", value = "是否立行立改(1-Yes;2-No;)", dataType = "Integer", dataTypeClass = Integer.class),
@@ -121,7 +121,7 @@ public class PostCheckedProblemController extends BaseController {
121
             @ApiImplicitParam(name = "problemLevel", value = "问题等级(一般、重要)", dataType = "String", dataTypeClass = String.class),
121
             @ApiImplicitParam(name = "problemLevel", value = "问题等级(一般、重要)", dataType = "String", dataTypeClass = String.class),
122
             @ApiImplicitParam(name = "dutyType", value = "职责类别:1-业务职责;2-党建及党风廉政;3-安全环保职责;4-合规保密职;", dataType = "Integer", dataTypeClass = Integer.class),
122
             @ApiImplicitParam(name = "dutyType", value = "职责类别:1-业务职责;2-党建及党风廉政;3-安全环保职责;4-合规保密职;", dataType = "Integer", dataTypeClass = Integer.class),
123
             @ApiImplicitParam(name = "problemAttribute", value = "问题属性(完整问题、有效性问题、适宜性问题)", dataType = "String", dataTypeClass = String.class),
123
             @ApiImplicitParam(name = "problemAttribute", value = "问题属性(完整问题、有效性问题、适宜性问题)", dataType = "String", dataTypeClass = String.class),
124
-            @ApiImplicitParam(name = "problemCategory", value = "问题类别(职责权限问题、工作内容问题、工作标准问题、考核奖励问题、考核奖励问题、任职资格问题、其他)", dataType = "String", dataTypeClass = String.class),
124
+            @ApiImplicitParam(name = "problemCategory", value = "问题类别(职责权限问题、工作内容问题、工作标准问题、考核奖励问题、任职资格问题、其他)", dataType = "String", dataTypeClass = String.class),
125
             @ApiImplicitParam(name = "description", value = "问题描述", dataType = "String", dataTypeClass = String.class),
125
             @ApiImplicitParam(name = "description", value = "问题描述", dataType = "String", dataTypeClass = String.class),
126
             @ApiImplicitParam(name = "problemCause", value = "问题原因", dataType = "String", dataTypeClass = String.class),
126
             @ApiImplicitParam(name = "problemCause", value = "问题原因", dataType = "String", dataTypeClass = String.class),
127
             @ApiImplicitParam(name = "isImmediatelyCorrected", value = "是否立行立改(1-Yes;2-No;)", dataType = "Integer", dataTypeClass = Integer.class),
127
             @ApiImplicitParam(name = "isImmediatelyCorrected", value = "是否立行立改(1-Yes;2-No;)", dataType = "Integer", dataTypeClass = Integer.class),
@@ -167,7 +167,7 @@ public class PostCheckedProblemController extends BaseController {
167
             @ApiImplicitParam(name = "problemLevel", value = "问题等级(一般、重要)", dataType = "String", dataTypeClass = String.class),
167
             @ApiImplicitParam(name = "problemLevel", value = "问题等级(一般、重要)", dataType = "String", dataTypeClass = String.class),
168
             @ApiImplicitParam(name = "dutyType", value = "职责类别:1-业务职责;2-党建及党风廉政;3-安全环保职责;4-合规保密职;", dataType = "Integer", dataTypeClass = Integer.class),
168
             @ApiImplicitParam(name = "dutyType", value = "职责类别:1-业务职责;2-党建及党风廉政;3-安全环保职责;4-合规保密职;", dataType = "Integer", dataTypeClass = Integer.class),
169
             @ApiImplicitParam(name = "problemAttribute", value = "问题属性(完整问题、有效性问题、适宜性问题)", dataType = "String", dataTypeClass = String.class),
169
             @ApiImplicitParam(name = "problemAttribute", value = "问题属性(完整问题、有效性问题、适宜性问题)", dataType = "String", dataTypeClass = String.class),
170
-            @ApiImplicitParam(name = "problemCategory", value = "问题类别(职责权限问题、工作内容问题、工作标准问题、考核奖励问题、考核奖励问题、任职资格问题、其他)", dataType = "String", dataTypeClass = String.class),
170
+            @ApiImplicitParam(name = "problemCategory", value = "问题类别(职责权限问题、工作内容问题、工作标准问题、考核奖励问题、任职资格问题、其他)", dataType = "String", dataTypeClass = String.class),
171
             @ApiImplicitParam(name = "description", value = "问题描述", dataType = "String", dataTypeClass = String.class),
171
             @ApiImplicitParam(name = "description", value = "问题描述", dataType = "String", dataTypeClass = String.class),
172
 //            @ApiImplicitParam(name = "problemCause", value = "问题原因", dataType = "String", dataTypeClass = String.class),
172
 //            @ApiImplicitParam(name = "problemCause", value = "问题原因", dataType = "String", dataTypeClass = String.class),
173
 //            @ApiImplicitParam(name = "isImmediatelyCorrected", value = "是否立行立改(1-Yes;2-No;)", dataType = "Integer", dataTypeClass = Integer.class),
173
 //            @ApiImplicitParam(name = "isImmediatelyCorrected", value = "是否立行立改(1-Yes;2-No;)", dataType = "Integer", dataTypeClass = Integer.class),
@@ -213,7 +213,7 @@ public class PostCheckedProblemController extends BaseController {
213
             @ApiImplicitParam(name = "checkUserName", value = "检查人姓名", dataType = "String", dataTypeClass = String.class),
213
             @ApiImplicitParam(name = "checkUserName", value = "检查人姓名", dataType = "String", dataTypeClass = String.class),
214
             @ApiImplicitParam(name = "problemLevel", value = "问题等级(一般、重要)", dataType = "String", dataTypeClass = String.class),
214
             @ApiImplicitParam(name = "problemLevel", value = "问题等级(一般、重要)", dataType = "String", dataTypeClass = String.class),
215
             @ApiImplicitParam(name = "problemAttribute", value = "问题属性(完整问题、有效性问题、适宜性问题)", dataType = "String", dataTypeClass = String.class),
215
             @ApiImplicitParam(name = "problemAttribute", value = "问题属性(完整问题、有效性问题、适宜性问题)", dataType = "String", dataTypeClass = String.class),
216
-            @ApiImplicitParam(name = "problemCategory", value = "问题类别(职责权限问题、工作内容问题、工作标准问题、考核奖励问题、考核奖励问题、任职资格问题、其他)", dataType = "String", dataTypeClass = String.class),
216
+            @ApiImplicitParam(name = "problemCategory", value = "问题类别(职责权限问题、工作内容问题、工作标准问题、考核奖励问题、任职资格问题、其他)", dataType = "String", dataTypeClass = String.class),
217
             @ApiImplicitParam(name = "description", value = "问题描述", dataType = "String", dataTypeClass = String.class),
217
             @ApiImplicitParam(name = "description", value = "问题描述", dataType = "String", dataTypeClass = String.class),
218
             @ApiImplicitParam(name = "problemCause", value = "问题原因", dataType = "String", dataTypeClass = String.class),
218
             @ApiImplicitParam(name = "problemCause", value = "问题原因", dataType = "String", dataTypeClass = String.class),
219
             @ApiImplicitParam(name = "isImmediatelyCorrected", value = "是否立行立改(1-Yes;2-No;)", dataType = "Integer", dataTypeClass = Integer.class),
219
             @ApiImplicitParam(name = "isImmediatelyCorrected", value = "是否立行立改(1-Yes;2-No;)", dataType = "Integer", dataTypeClass = Integer.class),

+ 1 - 1
ruoyi-postcheck/src/main/java/com/ruoyi/postCheck/domain/PostCheckedProblem.java

@@ -106,7 +106,7 @@ public class PostCheckedProblem extends BaseEntity {
106
 
106
 
107
     @ApiModelProperty("问题类别")
107
     @ApiModelProperty("问题类别")
108
     @TableField(value = "problem_category")
108
     @TableField(value = "problem_category")
109
-    @Excel(name = "问题类别", readConverterExp = "职责权限问题、工作内容问题、工作标准问题、考核奖励问题、考核奖励问题、任职资格问题、其他")
109
+    @Excel(name = "问题类别", readConverterExp = "职责权限问题、工作内容问题、工作标准问题、考核奖励问题、任职资格问题、其他")
110
     private String problemCategory;
110
     private String problemCategory;
111
 
111
 
112
     @ApiModelProperty("问题描述")
112
     @ApiModelProperty("问题描述")