Merge branch 'dev1.0' of http://git.ycjcjy.com/civilized_city/service into dev1.0

db/.back_文明创办/文明创办-backup-2023313112657.pdma.json → db/.back_文明创办/文明创办-backup-2023323142334.pdma.json

   "avatar": "",
   "version": "4.1.4",
   "createdTime": "2022-12-12 09:36:12",
-  "updatedTime": "2023-2-28 15:31:35",
+  "updatedTime": "2023-3-13 11:26:57",
   "dbConns": [],
   "profile": {
     "default": {
           "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
           "id": "B7406CE6-690F-4A9B-8BA4-4EF1F18B5C87"
         },
+        {
+          "defKey": "is_responsible",
+          "defName": "是否责任单位",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "1",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
+          "id": "40B1363B-2AD0-4B89-9ADE-A487DCB59573"
+        },
         {
           "defKey": "sort_no",
           "defName": "排序",

db/.back_文明创办/文明创办-backup-202325104648.pdma.json → db/.back_文明创办/文明创办-backup-2023323142415.pdma.json

   "avatar": "",
   "version": "4.1.4",
   "createdTime": "2022-12-12 09:36:12",
-  "updatedTime": "2023-2-4 21:25:08",
+  "updatedTime": "2023-3-23 14:23:34",
   "dbConns": [],
   "profile": {
     "default": {
           "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
           "id": "B7406CE6-690F-4A9B-8BA4-4EF1F18B5C87"
         },
+        {
+          "defKey": "is_responsible",
+          "defName": "是否责任单位",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "1",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
+          "id": "40B1363B-2AD0-4B89-9ADE-A487DCB59573"
+        },
         {
           "defKey": "sort_no",
           "defName": "排序",
           "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
           "id": "D1C0A2CD-89DB-44DF-918F-EA536E39761F"
         },
+        {
+          "defKey": "is_from_wx",
+          "defName": "是否微信端添加",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "0",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
+          "id": "FDA26255-02A6-4AD5-AA2C-B8C410548D44"
+        },
         {
           "defKey": "create_user",
           "defName": "创建人",
           "defName": "定位",
           "comment": "",
           "type": "VARCHAR",
-          "len": 32,
+          "len": 64,
           "scale": "",
           "primaryKey": false,
           "notNull": false,
           "domain": "",
           "id": "F2E17D81-03A9-42C4-8DD7-732C8D40DC59"
         },
+        {
+          "defKey": "loc_score_percent",
+          "defName": "实地测评得分占比",
+          "comment": "",
+          "type": "DECIMAL",
+          "len": 6,
+          "scale": 2,
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "",
+          "id": "DE02FAE0-A53F-4F6F-BB1B-B1669DD46C82"
+        },
+        {
+          "defKey": "survey_score_percent",
+          "defName": "调查问卷得分占比",
+          "comment": "",
+          "type": "DECIMAL",
+          "len": 6,
+          "scale": 2,
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "",
+          "id": "85BA110E-FCC5-4FC5-BE12-2C83C3D0EC27"
+        },
         {
           "defKey": "start_date",
           "defName": "开始日期",
           "refDict": "",
           "uiHint": "",
           "id": "1E651F5A-E5FA-4AB5-A67E-C2EF184FFD36"
+        },
+        {
+          "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": "FF90BF79-2A75-4638-98AE-B17BFD53F8CA"
         }
       ],
       "correlations": [],
       "fields": [
         {
           "defKey": "item_id",
-          "defName": "点位ID",
+          "defName": "测评项目ID",
           "comment": "",
           "type": "",
           "len": 32,
         {
           "defKey": "qu_id",
           "defName": "问题ID",
-          "comment": "来源点位问题",
+          "comment": "来源项目问题",
           "type": "",
           "len": "",
           "scale": "",
           "domain": "54611CCC-CA4B-42E1-9F32-4944C85B85A6",
           "id": "BF4E109D-9F8C-4E39-8803-A88E5A347AF3"
         },
+        {
+          "defKey": "community_name",
+          "defName": "社区名称",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "54611CCC-CA4B-42E1-9F32-4944C85B85A6",
+          "id": "B5CFBE96-9810-4B5D-9A21-F8664F16A45C"
+        },
         {
           "defKey": "name",
-          "defName": "具体(小区)名称",
+          "defName": "名称",
           "comment": "",
           "type": "",
           "len": "",
           "defName": "定位",
           "comment": "",
           "type": "VARCHAR",
-          "len": 32,
+          "len": 64,
           "scale": "",
           "primaryKey": false,
           "notNull": false,
         },
         {
           "defKey": "addr",
-          "defName": "定位描述",
+          "defName": "定位描述(小区)名称",
           "comment": "",
           "type": "",
           "len": "",
           "uiHint": "",
           "id": "D7BCB5EA-301A-4B0C-8DD2-F74C4CBFF3F3"
         },
+        {
+          "defKey": "user_name",
+          "defName": "作答人名称",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "54611CCC-CA4B-42E1-9F32-4944C85B85A6",
+          "id": "9EEC2EA3-0210-4385-8864-2AF7A5038727"
+        },
         {
           "defKey": "create_date",
           "defName": "作答时间",
           "defName": "定位",
           "comment": "",
           "type": "VARCHAR",
-          "len": 32,
+          "len": 64,
           "scale": "",
           "primaryKey": false,
           "notNull": false,
           "uiHint": "",
           "id": "219A66C3-6D3F-4F1E-A572-9E5294556142"
         },
+        {
+          "defKey": "loc_id",
+          "defName": "点位ID",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
+          "id": "B93801A5-158E-41EC-9CC9-F2E586414C2A"
+        },
+        {
+          "defKey": "loc_name",
+          "defName": "点位名称",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "54611CCC-CA4B-42E1-9F32-4944C85B85A6",
+          "id": "49BF27B0-A3B7-4D25-8B62-871DC3C7D4C0"
+        },
         {
           "defKey": "content",
           "defName": "测评标准",

db/.back_文明创办/文明创办-backup-202326113238.pdma.json → db/.back_文明创办/文明创办-backup-2023323142510.pdma.json

   "avatar": "",
   "version": "4.1.4",
   "createdTime": "2022-12-12 09:36:12",
-  "updatedTime": "2023-2-5 10:46:48",
+  "updatedTime": "2023-3-23 14:24:15",
   "dbConns": [],
   "profile": {
     "default": {
           "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
           "id": "B7406CE6-690F-4A9B-8BA4-4EF1F18B5C87"
         },
+        {
+          "defKey": "is_responsible",
+          "defName": "是否责任单位",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "1",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
+          "id": "40B1363B-2AD0-4B89-9ADE-A487DCB59573"
+        },
         {
           "defKey": "sort_no",
           "defName": "排序",
           "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
           "id": "D1C0A2CD-89DB-44DF-918F-EA536E39761F"
         },
+        {
+          "defKey": "is_from_wx",
+          "defName": "是否微信端添加",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "0",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
+          "id": "FDA26255-02A6-4AD5-AA2C-B8C410548D44"
+        },
         {
           "defKey": "create_user",
           "defName": "创建人",
           "defName": "定位",
           "comment": "",
           "type": "VARCHAR",
-          "len": 32,
+          "len": 64,
           "scale": "",
           "primaryKey": false,
           "notNull": false,
           "domain": "",
           "id": "F2E17D81-03A9-42C4-8DD7-732C8D40DC59"
         },
+        {
+          "defKey": "loc_score_percent",
+          "defName": "实地测评得分占比",
+          "comment": "",
+          "type": "DECIMAL",
+          "len": 6,
+          "scale": 2,
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "",
+          "id": "DE02FAE0-A53F-4F6F-BB1B-B1669DD46C82"
+        },
+        {
+          "defKey": "survey_score_percent",
+          "defName": "调查问卷得分占比",
+          "comment": "",
+          "type": "DECIMAL",
+          "len": 6,
+          "scale": 2,
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "",
+          "id": "85BA110E-FCC5-4FC5-BE12-2C83C3D0EC27"
+        },
         {
           "defKey": "start_date",
           "defName": "开始日期",
           "refDict": "",
           "uiHint": "",
           "id": "1E651F5A-E5FA-4AB5-A67E-C2EF184FFD36"
+        },
+        {
+          "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": "FF90BF79-2A75-4638-98AE-B17BFD53F8CA"
         }
       ],
       "correlations": [],
       "fields": [
         {
           "defKey": "item_id",
-          "defName": "点位ID",
+          "defName": "测评项目ID",
           "comment": "",
           "type": "",
           "len": 32,
           "refDict": "",
           "uiHint": "",
           "id": "4D9B5070-3252-4714-86D7-34928A0C5552"
+        },
+        {
+          "defKey": "copy_from",
+          "defName": "拷贝来源",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
+          "refDict": "",
+          "extProps": {},
+          "id": "0279B08D-E12C-4409-8253-A5D7766A7133"
         }
       ],
       "correlations": [],
         {
           "defKey": "qu_id",
           "defName": "问题ID",
-          "comment": "来源点位问题",
+          "comment": "来源项目问题",
           "type": "",
           "len": "",
           "scale": "",
           "domain": "54611CCC-CA4B-42E1-9F32-4944C85B85A6",
           "id": "BF4E109D-9F8C-4E39-8803-A88E5A347AF3"
         },
+        {
+          "defKey": "community_name",
+          "defName": "社区名称",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "54611CCC-CA4B-42E1-9F32-4944C85B85A6",
+          "id": "B5CFBE96-9810-4B5D-9A21-F8664F16A45C"
+        },
         {
           "defKey": "name",
-          "defName": "具体(小区)名称",
+          "defName": "名称",
           "comment": "",
           "type": "",
           "len": "",
           "defName": "定位",
           "comment": "",
           "type": "VARCHAR",
-          "len": 32,
+          "len": 64,
           "scale": "",
           "primaryKey": false,
           "notNull": false,
         },
         {
           "defKey": "addr",
-          "defName": "定位描述",
+          "defName": "定位描述(小区)名称",
           "comment": "",
           "type": "",
           "len": "",
           "uiHint": "",
           "id": "D7BCB5EA-301A-4B0C-8DD2-F74C4CBFF3F3"
         },
+        {
+          "defKey": "user_name",
+          "defName": "作答人名称",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "54611CCC-CA4B-42E1-9F32-4944C85B85A6",
+          "id": "9EEC2EA3-0210-4385-8864-2AF7A5038727"
+        },
         {
           "defKey": "create_date",
           "defName": "作答时间",
           "defName": "定位",
           "comment": "",
           "type": "VARCHAR",
-          "len": 32,
+          "len": 64,
           "scale": "",
           "primaryKey": false,
           "notNull": false,
           "uiHint": "",
           "id": "219A66C3-6D3F-4F1E-A572-9E5294556142"
         },
+        {
+          "defKey": "loc_id",
+          "defName": "点位ID",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
+          "id": "B93801A5-158E-41EC-9CC9-F2E586414C2A"
+        },
+        {
+          "defKey": "loc_name",
+          "defName": "点位名称",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "54611CCC-CA4B-42E1-9F32-4944C85B85A6",
+          "id": "49BF27B0-A3B7-4D25-8B62-871DC3C7D4C0"
+        },
         {
           "defKey": "content",
           "defName": "测评标准",

db/文明创办.pdma.json

   "avatar": "",
   "version": "4.1.4",
   "createdTime": "2022-12-12 09:36:12",
-  "updatedTime": "2023-3-13 11:26:57",
+  "updatedTime": "2023-3-23 14:25:10",
   "dbConns": [],
   "profile": {
     "default": {
           "refDict": "",
           "uiHint": "",
           "id": "1E651F5A-E5FA-4AB5-A67E-C2EF184FFD36"
+        },
+        {
+          "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": "FF90BF79-2A75-4638-98AE-B17BFD53F8CA"
         }
       ],
       "correlations": [],
           "refDict": "",
           "uiHint": "",
           "id": "4D9B5070-3252-4714-86D7-34928A0C5552"
+        },
+        {
+          "defKey": "copy_from",
+          "defName": "拷贝来源",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
+          "refDict": "",
+          "extProps": {},
+          "id": "0279B08D-E12C-4409-8253-A5D7766A7133"
         }
       ],
       "correlations": [],
           "extProps": {},
           "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
           "id": "A8365D64-DE0A-4F0E-9427-83DFF0ED66C6"
+        },
+        {
+          "defKey": "copy_from",
+          "defName": "拷贝来源",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
+          "refDict": "",
+          "extProps": {},
+          "id": "E2BA367C-D262-43FB-A729-D26D6453D20C"
         }
       ],
       "correlations": [],
           "refDict": "",
           "extProps": {},
           "id": "90218D19-7731-4AFE-8883-74944A66D6C8"
+        },
+        {
+          "defKey": "copy_from",
+          "defName": "拷贝来源",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
+          "refDict": "",
+          "extProps": {},
+          "id": "C0B26905-831F-4891-9B83-F84E4D111C44"
         }
       ],
       "correlations": [],

pom.xml

     </parent>
     <groupId>com.example</groupId>
     <artifactId>civilizedCity</artifactId>
-    <version>0.0.4</version>
+    <version>0.0.7</version>
     <name>civilizedCity</name>
     <description>civilizedCity</description>
     <properties>

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

 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.example.civilizedcity.common.*;
+import com.example.civilizedcity.entity.SysUser;
 import com.example.civilizedcity.service.TaCheckItemService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
     }
 
 
+    /**
+     * 复制
+     *
+     * @param id 实例ID
+     * @return 实例对象
+     */
+    @ApiOperation("复制")
+    @PutMapping("/taCheck/{id}/copy")
+    public ResponseBean copy(@ApiParam("测评ID") @PathVariable String id,
+                             @ApiParam("对象实体") @RequestBody TaCheck taCheck) throws Exception {
+        TaCheck origin = taCheckService.getById(id);
+        if (null == taCheck || origin.getStatus() == Constants.STATUS_DELETE) {
+            return ResponseBean.error("未找到模拟测评信息");
+        }
+
+        String title = StringUtils.ifNull(taCheck.getTitle(), origin.getTitle() + "-复制");
+        TaCheck exists = taCheckService.getExistBy("title", title, false, true);
+
+        if (null != exists) {
+            return ResponseBean.error("测评名称重复");
+        }
+
+        SysUser sysUser = currentUser();
+        origin.setCreateUser(sysUser.getUserId());
+        origin.setTitle(title);
+        TaCheck newCheck = taCheckService.copy(origin);
+        return ResponseBean.success(newCheck);
+    }
+
+
     /**
      * 计算分数
      *

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

                              @ApiParam("问题单ID") @RequestParam(value = "issueId", required = false) Integer issueId,
                              @ApiParam("申请类型") @RequestParam(value = "applyType", required = false) String applyType,
                              @ApiParam("问题单来源") @RequestParam(value = "sourceType", required = false) String sourceType,
+                             @ApiParam("用户身份") @RequestParam(value = "duty", required = false) String duty,
                              @ApiParam(value = "是否全部") @RequestParam(value = "isAll", defaultValue = "false") Boolean isAll) throws Exception {
 
         SysUser sysUser = currentUser();
         String orgId = isManager(sysUser) ? null : sysUser.getOrgId();
 
+        if (StringUtils.isNotEmpty((duty))) {
+            if (Constants.DUTY_ORG_MANAGER.equals(duty) || Constants.DUTY_ORG_USER.equals(duty)) {
+                if (StringUtils.isEmpty(orgId)) {
+                    orgId = sysUser.getOrgId();
+                }
+            }
+        }
+
         IPage<TaIssueApply> pg = new Page<>(pageNum, pageSize);
         IPage<TaIssueApply> result = taIssueApplyService.getPageBy(pg, issueId, applyType, orgId, sourceType, isAll);
 

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

 
         queryWrapper.eq("status", Constants.STATUS_NORMAL);
         queryWrapper.orderByDesc("create_date");
-        IPage<TaMessage> result = taMessageService.page(pg);
+        IPage<TaMessage> result = taMessageService.page(pg, queryWrapper);
 
         return ResponseBean.success(result);
     }

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

       @ApiModelProperty(name = "创建时间",notes = "")
       private LocalDateTime createDate ;
 
+     /** 拷贝来源 */
+     @ApiModelProperty(name = "拷贝来源",notes = "")
+     private String copyFrom ;
 }

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

     @ApiModelProperty(name = "创建时间", notes = "")
     private LocalDateTime createDate;
 
+    /** 拷贝来源 */
+    @ApiModelProperty(name = "拷贝来源",notes = "")
+    private String copyFrom ;
+
     @TableField(exist = false)
     @ApiModelProperty(name = "是否只读, 只读代表不需要答题")
     private Integer answerNum;

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

 
      @ApiModelProperty(name = "上报问题",notes = "")
     private Boolean reportIssue;
+
+     /** 拷贝来源 */
+     @ApiModelProperty(name = "拷贝来源",notes = "")
+     private String copyFrom ;
 }

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

       @ApiModelProperty(name = "填空题单位",notes = "")
      private String fillUnit;
 
+      /** 拷贝来源 */
+      @ApiModelProperty(name = "拷贝来源",notes = "")
+      private String copyFrom ;
       /**
        * 答案列表
        */

src/main/java/com/example/civilizedcity/mapper/TaCheckAnswerItemMapper.java

                                         @Param("userId") String userId);
 
     List<TaCheckAnswerItem> getListByAnswer(@Param("answerId") String answerId);
+
+    long copyItems(@Param("checkId") String checkId);
 }

src/main/java/com/example/civilizedcity/mapper/TaCheckItemMapper.java

      int createNewLocItems(@Param("checkId") String checkId);
 
      List<TaCheckItem> getListBy(@Param("checkId") String checkId, @Param("itemType") String itemType);
- }
+
+    long copyItems(@Param("oldCheckId") String oldCheckId, @Param("newCheckId") String newCheckId);
+}

src/main/java/com/example/civilizedcity/mapper/TaCheckItemQuMapper.java

      Integer countByItem(@Param("itemId") String itemId);
 
      List<TaCheckItemQu> getListBy(@Param("itemId") String itemId);
- }
+
+    long copyItems(@Param("checkId") String checkId);
+}

src/main/java/com/example/civilizedcity/service/TaCheckService.java

 public interface TaCheckService extends IBaseService<TaCheck> {
 
      TaCheck calcScore(TaCheck taCheck);
+
+     TaCheck copy(TaCheck taCheck);
  }

src/main/java/com/example/civilizedcity/service/impl/SysUserServiceImpl.java

 import com.example.civilizedcity.common.EncryptUtils;
 import com.example.civilizedcity.common.StringUtils;
 import com.example.civilizedcity.entity.*;
-import com.example.civilizedcity.mapper.SysLoginMapper;
-import com.example.civilizedcity.mapper.SysUserDutyMapper;
-import com.example.civilizedcity.mapper.SysUserRoleMapper;
+import com.example.civilizedcity.mapper.*;
 import com.example.civilizedcity.vo.ChangePassword;
 import com.example.civilizedcity.vo.LoginParam;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
-import com.example.civilizedcity.mapper.SysUserMapper;
 import com.example.civilizedcity.service.SysUserService;
 
 import java.time.LocalDateTime;
     @Autowired
     SysUserDutyMapper sysUserDutyMapper;
 
+    @Autowired
+    TaPersonMapper taPersonMapper;
+
     String defaultPwd = "123456";
 
     @Override
         return sysLoginMapper.updateById(sysLogin) > 0;
     }
 
+    private boolean getBool(Boolean b) {
+        return null != b && b;
+    }
+
+    /**
+     * 校验是否市民
+     * 用户的 orgId == 市民的 personId
+     * @param sysUser
+     * @return
+     */
+    private boolean isCitizen(SysUser sysUser) {
+        if (null == sysUser || StringUtils.isEmpty(sysUser.getOrgId())) {
+            return false;
+        }
+
+        TaPerson taPerson = taPersonMapper.selectById(sysUser.getOrgId());
+        return null != taPerson && taPerson.getStatus() > Constants.STATUS_DELETE;
+    }
+
     @Override
     public boolean mergeData(SysUser sysUser) throws Exception {
         if (StringUtils.isEmpty(sysUser.getName())) {
 
         LocalDateTime now = LocalDateTime.now();
 
-        // 用户表
-        String userId = sysUser.getUserId();
-        if (StringUtils.isEmpty(userId)) {
-            if (!StringUtils.isEmpty(sysUser.getPhone())) {
-                SysUser origin = getExistBy("phone", sysUser.getPhone(), false, true);
-                if (null != origin) {
-                    throw new Exception("手机号重复");
+        boolean newOne = StringUtils.isEmpty(sysUser.getUserId());
+
+        if (!StringUtils.isEmpty(sysUser.getPhone())) {
+            SysUser origin = getExistBy("phone", sysUser.getPhone(), false, true);
+            if (null != origin) {
+                if (!newOne && !origin.getUserId().equals(sysUser.getUserId())) {
+                    throw new Exception("手机号码重复");
                 }
-            }
 
-            if (null == sysUser.getStatus()) {
-                sysUser.setStatus(Constants.STATUS_NORMAL);
+                newOne = false;
+                sysUser.setUserId(origin.getUserId());
+
+                // 如果是市民
+                if (isCitizen(origin)) {
+                    sysUser.setIsUser(true);
+                }
             }
+        }
+
+        if (null == sysUser.getStatus()) {
+            sysUser.setStatus(Constants.STATUS_NORMAL);
+        }
 
+        // 用户表
+        if (newOne) {
             sysUser.setCreateDate(now);
             save(sysUser);
-            userId = sysUser.getUserId();
         } else {
-            if (!StringUtils.isEmpty(sysUser.getPhone())) {
-                SysUser origin = getByButNot("phone", sysUser.getPhone(), "user_id", userId, true);
-                if (null != origin) {
-                    throw new Exception("手机号重复");
-                }
-            }
-
-            //
             updateById(sysUser);
         }
 
+        // 登录账户
+        SysLogin sysLogin = sysLoginMapper.getByAccount(sysUser.getPhone());
+        if (null == sysLogin) {
+            sysLogin = new SysLogin();
+
+            sysLogin.setAccount(sysUser.getPhone());
+            sysLogin.setPassword(EncryptUtils.md5(EncryptUtils.md5(defaultPwd), sysUser.getUserId()));
+            sysLogin.setUserId(sysUser.getUserId());
+            sysLogin.setStatus(Constants.STATUS_NORMAL);
+            sysLogin.setCreateDate(now);
+            sysLoginMapper.insert(sysLogin);
+        }
+
         // 授权角色
         List<SysRole> rolesList = sysUser.getRolesList();
         if (null == rolesList || rolesList.size() == 0) {

src/main/java/com/example/civilizedcity/service/impl/TaCheckServiceImpl.java

 import com.example.civilizedcity.service.TaCheckService;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.time.LocalDateTime;
 import java.util.List;
 
 /**
         return taCheck;
     }
 
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public TaCheck copy(TaCheck taCheck) {
+        TaCheck newCheck = new TaCheck();
+        newCheck.setCopyFrom(taCheck.getCheckId());
+        newCheck.setTitle(taCheck.getTitle());
+        newCheck.setStartDate(taCheck.getStartDate());
+        newCheck.setEndDate(taCheck.getEndDate());
+        newCheck.setLocScorePercent(taCheck.getLocScorePercent());
+        newCheck.setSurveyScorePercent(taCheck.getSurveyScorePercent());
+        newCheck.setStatus(Constants.STATUS_NORMAL);
+        newCheck.setCreateUser(taCheck.getCreateUser());
+        newCheck.setCreateDate(LocalDateTime.now());
+
+        save(newCheck);
+
+        // 拷贝测评项目
+        taCheckItemMapper.copyItems(taCheck.getCheckId(), newCheck.getCheckId());
+
+        // 拷贝测评问题
+        taCheckItemQuMapper.copyItems(taCheck.getCheckId());
+
+        taCheckAnswerItemMapper.copyItems(taCheck.getCheckId());
+
+        return newCheck;
+    }
+
     /**
      * 计算点位分数
      * 计算的前提是, 每份试卷（ta_check_answer）的分数已经计算好了

src/main/java/com/example/civilizedcity/service/impl/TaIssueApplyServiceImpl.java

         taOrgIssueMapper.updateById(taOrgIssue);
 
         // 再次生成流程记录,
-        createProcessByIssue(taIssue, sysUser);
+        createProcessByIssue(taIssue, sysUser, origin);
 
 //        // 如果是用户随手拍
 //        if (Constants.SOURCE_FEEDBACK.equals(taIssue.getSourceType())) {
         applicationEventPublisher.publishEvent(new MessagEvent(this, origin));
     }
 
-    private void createProcessByIssue(TaIssue taIssue, SysUser sysUser) {
+    private void createProcessByIssue(TaIssue taIssue, SysUser sysUser, TaIssueApply taIssueApply) {
         TaIssueProcess taIssueProcess = new TaIssueProcess();
         taIssueProcess.setIssueId(taIssue.getIssueId());
         taIssueProcess.setOrgId(taIssue.getOrgId());
         taIssueProcess.setProcessNode(taIssue.getProcessNode());
         taIssueProcess.setProcessStatus(taIssue.getProcessStatus());
-        taIssueProcess.setProcessResult(null);
+        taIssueProcess.setProcessResult(taIssueApply.getVerifyDesc());
+//        taIssueProcess.setProcessResult(null);
         taIssueProcess.setCreateUser(sysUser.getUserId());
         taIssueProcess.setCreateDate(LocalDateTime.now());
         taIssueProcess.setStatus(Constants.STATUS_NORMAL);

src/main/java/com/example/civilizedcity/service/impl/TaMessageServiceImpl.java

 package com.example.civilizedcity.service.impl;
 
 import com.example.civilizedcity.common.Constants;
+import com.example.civilizedcity.common.StringUtils;
 import com.example.civilizedcity.entity.TaIssue;
 import com.example.civilizedcity.entity.TaIssueApply;
 import org.apache.ibatis.annotations.Param;
                     break;
             }
         } else {
+            String content = "ID: "+ taIssueApply.getIssueId()  +" ， 审核结果: " + (Constants.APPLY_PASS.equals(taIssueApply.getVerifyStatus()) ? "通过" : "不通过");
+            content += String.format("。 意见： %s", StringUtils.ifNull(taIssueApply.getVerifyDesc(), "无"));
+
             taMessage.setMsgType("verify-" + taIssueApply.getApplyType());
-            taMessage.setContent("审核结果: " + (Constants.APPLY_PASS.equals(taIssueApply.getVerifyStatus()) ? "通过" : "不通过"));
+            taMessage.setContent(content);
             taMessage.setReceiveUser(null);
             taMessage.setOrgId(taIssueApply.getOrgId());
 

src/main/resources/mapper/TaCheckAnswerItemMapper.xml

 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
 <mapper namespace="com.example.civilizedcity.mapper.TaCheckAnswerItemMapper">
+    <insert id="copyItems">
+        INSERT INTO ta_check_item_an (
+            `answer_id`,
+            `copy_from`,
+            `qu_id`,
+            `answer_code`,
+            `answer`,
+            `score`,
+            `report_issue`,
+            `sort_no`
+        ) SELECT
+              UUID_SHORT( ),
+              t.`answer_id`,
+              s.`qu_id`,
+              t.`answer_code`,
+              t.`answer`,
+              t.`score`,
+              t.`report_issue`,
+              t.`sort_no`
+        FROM
+            ta_check_item_an t
+                INNER JOIN ta_check_item_qu s ON t.qu_id = s.copy_from
+                INNER JOIN ta_check_item m ON s.item_id = m.item_id
+                INNER JOIN ta_check n ON m.check_id = n.check_id
+        WHERE
+            n.copy_from = #{checkId}
+    </insert>
 
     <select id="getListBy" resultType="com.example.civilizedcity.entity.TaCheckAnswerItem">
         SELECT

src/main/resources/mapper/TaCheckItemMapper.xml

         ORDER BY
             t.sort_no ASC
     </insert>
+    <insert id="copyItems">
+        insert into ta_check_item (
+            `item_id`,
+            `copy_from`,
+            `check_id`,
+            `item_type`,
+            `type_id`,
+            `name`,
+            `full_score`,
+            `num`,
+            `status`,
+            `create_date`
+        )
+        select
+            UUID_SHORT(),
+            t.`item_id`,
+            #{newCheckId},
+            t.`item_type`,
+            t.`type_id`,
+            t.`name`,
+            t.`full_score`,
+            t.`num`,
+            1,
+            now()
+        from ta_check_item t
+        WHERE t.check_id = #{oldCheckId}
+          and t.`status` = 1
+    </insert>
 
     <select id="getPageBy" resultType="com.example.civilizedcity.entity.TaCheckItem">
         SELECT

src/main/resources/mapper/TaCheckItemQuMapper.xml

 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
 <mapper namespace="com.example.civilizedcity.mapper.TaCheckItemQuMapper">
+    <insert id="copyItems">
+        INSERT INTO ta_check_item_qu (
+            `qu_id`,
+            `copy_from`,
+            `item_id`,
+            `qu_type`,
+            `title`,
+            `compute_type`,
+            `max_score`,
+            `an_score`,
+            `fill_unit`,
+            `stand`,
+            `sort_no`
+        ) SELECT
+              UUID_SHORT( ),
+              t.`qu_id`,
+              s.`item_id`,
+              t.`qu_type`,
+              t.`title`,
+              t.`compute_type`,
+              t.`max_score`,
+              t.`an_score`,
+              t.`fill_unit`,
+              t.`stand`,
+              t.`sort_no`
+        FROM
+            ta_check_item_qu t
+                INNER JOIN ta_check_item s ON t.item_id = s.copy_from
+                INNER JOIN ta_check m ON s.check_id = m.check_id
+        WHERE
+            m.copy_from = #{checkId}
+    </insert>
 
     <select id="countByItem" resultType="java.lang.Integer">
         SELECT