1111

db/.back_文明创办/文明创办-backup-2023327191207.pdma.json → db/.back_文明创办/.back_文明创办/文明创办-backup-2023511101645.pdma.json

@@ -4,7 +4,7 @@
   "avatar": "",
   "version": "4.1.4",
   "createdTime": "2022-12-12 09:36:12",
-  "updatedTime": "2023-3-23 14:25:10",
+  "updatedTime": "2023-5-8 16:33:28",
   "dbConns": [],
   "profile": {
     "default": {
@@ -494,7 +494,8 @@
         "hideInGraph": true
       }
     ],
-    "modelType": "modalGroup"
+    "modelType": "modalGroup",
+    "menuWidth": "250px"
   },
   "entities": [
     {
@@ -3912,6 +3913,23 @@
           "refDict": "",
           "uiHint": "",
           "id": "7FF626A4-AF1C-4CF5-B356-D46DB6D534B3"
+        },
+        {
+          "defKey": "copy_from",
+          "defName": "复制来源",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
+          "id": "1F85BFC4-DBF4-4BA5-9BD8-DC9C2BFA1646"
         }
       ],
       "correlations": [],
@@ -4919,6 +4937,40 @@
           "domain": "",
           "id": "52C74C06-CC1C-416E-B913-78B500CE30A2"
         },
+        {
+          "defKey": "loc_num",
+          "defName": "实地测评份数",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
+          "id": "FC14EB4B-E1C2-411A-A051-0D3C15002B61"
+        },
+        {
+          "defKey": "survey_num",
+          "defName": "调查问卷份数",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
+          "id": "DAA70103-78D7-46A9-98F8-87963984C229"
+        },
         {
           "defKey": "status",
           "defName": "状态",

db/upgrade.1.1.sql

@@ -1,3 +1,9 @@
 
 ALTER TABLE `sys_org`
-    ADD COLUMN `is_responsible` int(0) NULL DEFAULT 1 COMMENT '是否责任单位' AFTER `org_p_id`;
+    ADD COLUMN `is_responsible` int(0) NULL DEFAULT 1 COMMENT '是否责任单位' AFTER `org_p_id`;
+
+
+  ALTER TABLE `ta_check_item`
+    ADD COLUMN `culture_term` varchar(255) NULL COMMENT '文明用语' AFTER copy_from;
+
+

db/文明创办.pdma.json

@@ -2,9 +2,9 @@
   "name": "文明创办",
   "describe": "文明创办",
   "avatar": "",
-  "version": "4.1.4",
+  "version": "4.1.1",
   "createdTime": "2022-12-12 09:36:12",
-  "updatedTime": "2023-5-8 16:33:28",
+  "updatedTime": "2023-5-10 11:56:46",
   "dbConns": [],
   "profile": {
     "default": {

src/main/java/com/example/civilizedcity/common/ExportIssueUtil.java

@@ -48,6 +48,15 @@ public class ExportIssueUtil {
                 issueExport.setProcessNum(taIssue.getProcessNum());
                 issueExport.setUserName(taIssue.getUserName());
                 issueExport.setEndDate(taIssue.getEndDate());
+//                issueExport.setSourceType(taIssue.getSourceType());
+                String sourceType=taIssue.getSourceType();
+                if(sourceType.equals(Constants.SOURCE_FEEDBACK)){
+                    issueExport.setSourceType("市民上报");
+                }else if(sourceType.equals(Constants.SOURCE_CHECK)){
+                    issueExport.setSourceType("实地测评");
+                }else if(sourceType.equals(Constants.SOURCE_INSPECTOR)){
+                    issueExport.setSourceType("日常督查");
+                }
 
                 // 转换机构
                 if (StringUtils.isNotEmpty(taIssue.getOrgId())) {

src/main/java/com/example/civilizedcity/controller/TaIssueController.java

@@ -151,6 +151,7 @@ public class TaIssueController extends BaseController {
 
         queryWrapper.eq(StringUtils.isNotEmpty(locId), "loc_id", locId);
         queryWrapper.eq(StringUtils.isNotEmpty(orgId), "org_id", orgId);
+        queryWrapper.eq(StringUtils.isNotEmpty(sourceType), "source_type", sourceType);
         queryWrapper.like(StringUtils.isNotEmpty(userName), "user_name", userName);
         queryWrapper.between(null != createDateStart, "create_date", createDateStart, createDateEnd);
         queryWrapper.between(null != endDateStart, "end_date", endDateStart, endDateEnd);

src/main/java/com/example/civilizedcity/entity/TaCheckItem.java

@@ -87,6 +87,10 @@ public class TaCheckItem implements Serializable, Cloneable {
     @ApiModelProperty(name = "拷贝来源",notes = "")
     private String copyFrom ;
 
+    /** 文明用语 */
+    @ApiModelProperty(name = "文明用语",notes = "")
+    private String cultureTerm ;
+
     @TableField(exist = false)
     @ApiModelProperty(name = "是否只读, 只读代表不需要答题")
     private Integer answerNum;

src/main/java/com/example/civilizedcity/entity/TaIssue.java

@@ -104,8 +104,9 @@ public class TaIssue implements Serializable, Cloneable {
     @ApiModelProperty(name = "责任单位", notes = "")
     private String orgId;
 
-    @ExcelIgnore
-    @ApiModelProperty(name = "来源类型", notes = "feedback市民上报,check模拟测评")
+    @ColumnWidth(30)
+    @ExcelProperty(value = "责任单位", index = 9)
+    @ApiModelProperty(name = "来源类型", notes = "check 模拟测评  feedback 市民上报  inspector 督查员上报")
     private String sourceType;
 
     @ExcelIgnore
@@ -144,6 +145,8 @@ public class TaIssue implements Serializable, Cloneable {
     @ApiModelProperty(name = "上报人身份", notes = "")
     private String userDuty;
 
+
+
     @ColumnWidth(30)
     @ExcelProperty(value = "上报日期", index = 1, converter = LocalDateTimeConverter.class)
     @ApiModelProperty(name = "创建时间", notes = "")
@@ -161,4 +164,7 @@ public class TaIssue implements Serializable, Cloneable {
     @TableField(exist = false)
     @ApiModelProperty(name = "文件列表", notes = "")
     private List<TaAttach> attachList;
+
+
+
 }

src/main/java/com/example/civilizedcity/vo/IssueExport.java

@@ -33,6 +33,11 @@ public class IssueExport {
     @ApiModelProperty(name = "问题类型", notes = "")
     private String typeName;
 
+    @ColumnWidth(24)
+    @ExcelProperty(value = "问题来源")
+    @ApiModelProperty(name = "问题来源", notes = "check 模拟测评  feedback 市民上报  inspector 督查员上报")
+    private String sourceType;
+
     @ColumnWidth(30)
     @ExcelProperty(value = "上报日期", converter = LocalDateTimeConverter.class)
     @ApiModelProperty(name = "创建时间", notes = "")