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

db/.back_文明创办/文明创办-backup-2023330100554.pdma.json → db/.back_文明创办/文明创办-backup-2023518101923.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-3-27 19:12:07",
+  "updatedTime": "2023-5-10 11:56:46",
   "dbConns": [],
   "profile": {
     "default": {
@@ -494,7 +494,8 @@
         "hideInGraph": true
       }
     ],
-    "modelType": "modalGroup"
+    "modelType": "modalGroup",
+    "menuWidth": "250px"
   },
   "entities": [
     {
@@ -4936,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/.back_文明创办/文明创办-backup-2023415134743.pdma.json → db/.back_文明创办/文明创办-backup-2023518112034.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-3-30 10:05:54",
+  "updatedTime": "2023-5-18 11:20:05",
   "dbConns": [],
   "profile": {
     "default": {
@@ -494,7 +494,8 @@
         "hideInGraph": true
       }
     ],
-    "modelType": "modalGroup"
+    "modelType": "modalGroup",
+    "menuWidth": "250px"
   },
   "entities": [
     {
@@ -4936,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

@@ -8,4 +8,10 @@ ALTER TABLE `sys_org`
 
 
 ALTER TABLE `ta_issue`
-ADD COLUMN source_type2 varchar(32) NULL COMMENT 'PC问题来源: check 模拟测评  feedback 市民上报  inspector 督查员上报' AFTER copy_from;
+ADD COLUMN source_type2 varchar(32) NULL COMMENT 'PC问题来源: check 模拟测评  feedback 市民上报  inspector 督查员上报' AFTER copy_from;
+
+<<<<<<< HEAD
+=======
+ALTER TABLE `ta_check_answer`
+    ADD COLUMN `card_title` varchar(255) NULL COMMENT '卡片名称(小程序端，新建定位时显示的名称)' AFTER `user_name`;
+>>>>>>> 09c481190cc5ad63c138fc86136b4595e7934ae3

db/文明创办.pdma.json

@@ -4,7 +4,7 @@
   "avatar": "",
   "version": "4.1.1",
   "createdTime": "2022-12-12 09:36:12",
-  "updatedTime": "2023-5-10 11:56:46",
+  "updatedTime": "2023-5-18 11:20:34",
   "dbConns": [],
   "profile": {
     "default": {
@@ -7186,6 +7186,23 @@
           "refDict": "",
           "uiHint": "",
           "id": "A836C724-F5D9-4A45-A413-209B55DDA976"
+        },
+        {
+          "defKey": "card_title",
+          "defName": "卡片名称",
+          "comment": "小程序端，新建定位时显示的名称",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
+          "id": "1CDF0BAA-5F46-498F-A791-FD71F33EB3D5"
         }
       ],
       "correlations": [],

pom.xml

@@ -43,6 +43,13 @@
             <scope>test</scope>
         </dependency>
 
+        <!--fastjson start-->
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>fastjson</artifactId>
+            <version>1.2.56</version>
+        </dependency>
+        <!--fastjson end-->
 
         <!--oss start-->
         <dependency>

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

@@ -0,0 +1,87 @@
+//package com.example.civilizedcity.common;
+//
+//import org.springframework.http.*;
+//import org.springframework.stereotype.Component;
+//import org.springframework.web.client.RestTemplate;
+//
+//import java.io.UnsupportedEncodingException;
+//import java.net.URLDecoder;
+//import java.util.*;
+//
+//@Component
+//public class HttpUtils {
+//    public String get(String url) throws Exception {
+//        RestTemplate restTemplate = new RestTemplate();
+//        HttpHeaders headers = new HttpHeaders();
+//        headers.setAccept(Arrays.asList(MediaType.APPLICATION_JSON));
+//        HttpEntity<String> entity = new HttpEntity<String>(headers);
+//
+//        Map<String, Object> urlAndParams = parseURL(url);
+//        String formatURL = (String) urlAndParams.get("url");
+//        Map<String, String> params = (Map<String, String>) urlAndParams.get("params");
+//
+//        ResponseEntity<String> resp = restTemplate.exchange(formatURL, HttpMethod.GET, entity, String.class, params);
+//        return resp.getBody();
+//    }
+//
+//    public String post(String url, Map<String, String> header, String body) throws Exception {
+//        RestTemplate restTemplate = new RestTemplate();
+//        HttpHeaders headers = new HttpHeaders();
+//        MediaType type = MediaType.parseMediaType("application/json; charset=UTF-8");
+//        headers.setContentType(type);
+//        headers.setAccept(Arrays.asList(MediaType.APPLICATION_JSON));
+//        headers.setAll(header);
+//        HttpEntity<String> entity = new HttpEntity<String>(body, headers);
+//
+//        Map<String, Object> urlAndParams = parseURL(url);
+//        String formatURL = (String) urlAndParams.get("url");
+//        Map<String, String> params = (Map<String, String>) urlAndParams.get("params");
+//
+//        ResponseEntity<String> resp = restTemplate.exchange(formatURL, HttpMethod.POST, entity, String.class, params);
+//        return resp.getBody();
+//    }
+//
+//    // RestTemplate 不能正常的处理 querystring, 必须按照约定的方式处理
+//    private Map<String, Object> parseURL(String url) {
+//        Map<String, Object> res = new HashMap<>();
+//
+//        String[] parts = url.split("\\?");
+//        String baseURL = parts[0];
+//
+//        if (parts.length < 2) {
+//            res.put("url", baseURL);
+//            res.put("params", new HashMap<>());
+//            return res;
+//        }
+//
+//
+//        String[] fields = parts[1].split("&");
+//        Map<String, String> params = new HashMap<>();
+//        List<String> searchList = new ArrayList<>();
+//        for (String field : fields) {
+//            String[] pairs = field.split("=");
+//            if (2 != pairs.length) {
+//                continue;
+//            }
+//
+//            try {
+//                String key = URLDecoder.decode(pairs[0].trim(), "UTF-8");
+//                String val = URLDecoder.decode(pairs[1].trim(), "UTF-8");
+//
+//                // 转化为 "foo={foo}" 这种字符串
+//                searchList.add(String.format("%s={%s}", key, key));
+//                // 把 foo 对应的值存储起来
+//                params.put(key, val);
+//            } catch (UnsupportedEncodingException e) {
+//                e.printStackTrace();
+//            }
+//        }
+//
+//        // url 格式类似 http://foo.org/bar?name={name}
+//        String formatURL = baseURL + "?" + String.join("&", searchList);
+//        res.put("url", formatURL);
+//        res.put("params", params);
+//
+//        return res;
+//    }
+//}

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

@@ -0,0 +1,65 @@
+//package com.example.civilizedcity.common;
+//
+//import com.alibaba.fastjson.JSONObject;
+//import lombok.Data;
+//import lombok.experimental.Accessors;
+//import lombok.extern.slf4j.Slf4j;
+//import org.springframework.beans.factory.InitializingBean;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.beans.factory.annotation.Value;
+//import org.springframework.scheduling.annotation.EnableAsync;
+//import org.springframework.scheduling.annotation.EnableScheduling;
+//import org.springframework.stereotype.Component;
+//
+//import java.util.HashMap;
+//import java.util.Map;
+//
+//@Slf4j
+//@Component
+//@EnableScheduling //开启定时任务
+//@EnableAsync  //开启多线程
+//public class SMSUtils implements InitializingBean {
+//    @Autowired
+//    HttpUtils httpUtils;
+//    @Value("${yz.sms.api}")
+//    String smsAPI;
+//
+//    @Value("${yz.sms.appid}")
+//    String appid;
+//
+//    //    @Async
+////    @Scheduled(cron = "0 30 8 * * ?") //时隔多少秒
+//    public void SendMessage(Message message) throws Exception {
+//        long nowMills = System.currentTimeMillis();
+//        String timestamp = String.valueOf(nowMills);
+//        String secret = appid + timestamp;
+//
+//        Map<String, String> header = new HashMap<>();
+//        header.put("x-appid", appid);
+//        header.put("x-timestamp", timestamp);
+//        header.put("x-sign", EncryptUtils.md5(appid + secret, timestamp));
+//
+//        Map<String, String> body = new HashMap<>();
+//        body.put("PhoneNumbers", message.getTel());
+//        body.put("SignName", message.getSign());
+//        body.put("TemplateCode", message.getCode());
+//        body.put("TemplateParam", message.getContent());
+//
+//        httpUtils.post(smsAPI, header, JSONObject.toJSONString(body, false));
+//
+//    }
+//
+//    @Override
+//    public void afterPropertiesSet() throws Exception {
+//    }
+//
+//    @Data
+//    @Accessors(chain = true)
+//    public static class Message {
+//        String code;
+//        String tel;
+//        String sign;
+//        String content;
+//    }
+//
+//}

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

@@ -5,8 +5,9 @@ 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.entity.TaCheckItem;
+import com.example.civilizedcity.entity.TaCheck;
 import com.example.civilizedcity.service.TaCheckItemService;
+import com.example.civilizedcity.service.TaCheckService;
 import com.example.civilizedcity.vo.CheckLocExport;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -14,8 +15,6 @@ import io.swagger.annotations.ApiParam;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.*;
-import com.example.civilizedcity.entity.TaCheck;
-import com.example.civilizedcity.service.TaCheckService;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.FileInputStream;
@@ -35,15 +34,13 @@ import java.util.Map;
 @RequestMapping("/")
 public class TaCheckController extends BaseController {
 
+    @Value("${yz.excel.tpl.check}")
+    String tplPath;
     @Autowired
     private TaCheckService taCheckService;
-
     @Autowired
     private TaCheckItemService taCheckItemService;
 
-    @Value("${yz.excel.tpl.check}")
-    String tplPath;
-
     /**
      * 通过ID查询单条数据
      *
@@ -172,6 +169,7 @@ public class TaCheckController extends BaseController {
     private Double getVal(Double d) {
         return null == d ? 0.0 : d;
     }
+
     private Integer getVal(Integer d) {
         return null == d ? 0 : d;
     }
@@ -237,4 +235,18 @@ public class TaCheckController extends BaseController {
         taCheckService.removeLogicById(id);
         return ResponseBean.success("success");
     }
+
+    /**
+     * 同步点位分类
+     *
+     * @checkId
+     */
+
+    @ApiOperation("通过id来同步点位")
+    @PutMapping("/taCheck/{checkId}/sync")
+    public ResponseBean syncPoint(@ApiParam("对象ID") @PathVariable String checkId) {
+        taCheckItemService.syncLoc(checkId);
+        taCheckItemService.updateLoc(checkId);
+        return ResponseBean.success("success");
+    }
 }

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

@@ -87,4 +87,9 @@ public class TaCheckAnswer implements Serializable,Cloneable{
      @TableField(exist = false)
      @ApiModelProperty(name = "点位名称",notes = "")
      private String typeName ;
+
+
+     /** 卡片名称 */
+     @ApiModelProperty(name = "卡片名称",notes = "")
+     private String cardTitle ;
 }

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

@@ -94,4 +94,5 @@ public class TaCheckItem implements Serializable, Cloneable {
     @TableField(exist = false)
     @ApiModelProperty(name = "是否只读, 只读代表不需要答题")
     private Integer answerNum;
+
 }

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

@@ -38,4 +38,8 @@ public interface TaCheckItemMapper  extends BaseMapper<TaCheckItem>{
     int calcScore(@Param("checkId") String checkId);
 
     List<CheckLocExport> getExportByCheck(@Param("checkId") String checkId, @Param("itemType") String itemType);
+
+    void updateLoc(@Param("checkId") String checkId);
+
+    void syncLoc(@Param("checkId") String checkId);
 }

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

@@ -25,4 +25,8 @@ public interface TaCheckItemService extends IBaseService<TaCheckItem> {
      boolean updateFullScore(String itemId);
 
      List<CheckLocExport> getExportByCheck(String checkId, String itemType);
- }
+
+     void updateLoc(String checkId);
+
+     void syncLoc(String checkId);
+}

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

@@ -2,7 +2,6 @@ package com.example.civilizedcity.service.impl;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.example.civilizedcity.common.Constants;
-import com.example.civilizedcity.common.NumberUtil;
 import com.example.civilizedcity.common.StringUtils;
 import com.example.civilizedcity.entity.*;
 import com.example.civilizedcity.mapper.*;
@@ -123,6 +122,15 @@ public class TaCheckItemServiceImpl extends BaseServiceImpl<TaCheckItemMapper, T
         return baseMapper.getExportByCheck(checkId, itemType);
     }
 
+    @Override
+    public void updateLoc(String checkId){
+        baseMapper.updateLoc(checkId);
+    }
+    @Override
+    public void syncLoc(String checkId){
+        baseMapper.syncLoc(checkId);
+    }
+
     /**
      * 作答计算分数
      * 试卷总分 = 每一题分数求和
@@ -284,4 +292,7 @@ public class TaCheckItemServiceImpl extends BaseServiceImpl<TaCheckItemMapper, T
     private TaCheckItemQu getQu(List<TaCheckItemQu> quList, String quId) {
         return quList.stream().filter(q -> q.getQuId().equals(quId)).findFirst().orElse(null);
     }
+
+
+
 }

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

@@ -5,9 +5,9 @@ import com.example.civilizedcity.common.Constants;
 import com.example.civilizedcity.common.StringUtils;
 import com.example.civilizedcity.entity.*;
 import com.example.civilizedcity.mapper.*;
+import com.example.civilizedcity.service.TaFeedbackService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.example.civilizedcity.service.TaFeedbackService;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalDateTime;
@@ -139,6 +139,10 @@ public class TaFeedbackServiceImpl extends BaseServiceImpl<TaFeedbackMapper, TaF
             processStatus = Constants.APPLY_REJECT;
         }
 
+        if (processList.size() == 0) {
+            processList = null;
+        }
+
         return baseMapper.getPageBy(pg, personId, processList, processStatus);
     }
 }

src/main/resources/application-dev.yml

@@ -26,7 +26,7 @@ yz:
     prefix: http://127.0.0.1:8000
   excel:
     tpl:
-      check: E:\work\civilized_city\service\src\main\resources\check_tpl.xlsx
+      check: E:\work\Java+web\07霍山\service\src\main\resources\check_tpl.xlsx
 
 wx:
   miniapp:

src/main/resources/mapper/TaCheckItemMapper.xml

@@ -5,84 +5,106 @@
     <insert id="createNewLocItems">
         INSERT INTO ta_check_item (item_id, check_id, item_type, type_id, `name`)
         SELECT
-            UUID_SHORT(),
-            #{checkId},
-            'loc',
-            t.type_id,
-            t.`name`
+        UUID_SHORT(),
+        #{checkId},
+        'loc',
+        t.type_id,
+        t.`name`
         FROM
-            td_loc_type t
+        td_loc_type t
         WHERE
-            t.`status` &gt; -1
+        t.`status` &gt; -1
         ORDER BY
-            t.sort_no ASC
+        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`
+        `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()
+        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
+        and t.`status` = 1
     </insert>
+
+    <insert id="syncLoc">
+        INSERT INTO ta_check_item(`item_id`,`type_id`,`name`,`create_date`,
+        `status`,`num`,`full_score`,`item_type`,`copy_from`,`check_id`)
+        SELECT
+        UUID_SHORT(), s.type_id ,s.name,now(),1,null,null,'loc',null, #{checkId}
+        FROM
+        td_loc_type s
+        WHERE
+        s.`status` = 1 AND
+        s.type_id NOT IN ( SELECT t.type_id FROM ta_check_item t WHERE t.`status` = 1 AND t.check_id = #{checkId}
+        AND t.item_type = "loc" )
+    </insert>
+
+    <update id="updateLoc">
+        UPDATE ta_check_item c inner join td_loc_type l ON c.type_id = l.type_id
+        SET c.status = l.status
+        WHERE c.check_id = #{checkId}
+    </update>
+
     <update id="updateFullScore">
         UPDATE ta_check_item t
         SET t.full_score = ( SELECT sum( s.max_score ) FROM ta_check_item_qu s WHERE s.item_id = #{itemId} )
         WHERE
-            t.item_id = #{itemId}
+        t.item_id = #{itemId}
     </update>
     <update id="calcScore">
         UPDATE ta_check_item t
         SET t.score = ( SELECT sum( s.score ) FROM ta_check_answer s WHERE s.item_id = t.item_id )
         WHERE
-            t.check_id = #{checkId}
+        t.check_id = #{checkId}
     </update>
 
+
+
     <select id="getPageBy" resultType="com.example.civilizedcity.entity.TaCheckItem">
         SELECT
-            IFNULL(m.num, 0) as answer_num,
-            t.*
+        IFNULL(m.num, 0) as answer_num,
+        t.*
+        FROM
+        ta_check_item t
+        INNER JOIN ta_check c ON c.check_id = t.check_id
+        <if test="itemType != null and itemType == 'loc'">
+            INNER JOIN td_loc_type s ON t.type_id = s.type_id
+        </if>
+        LEFT JOIN (
+        SELECT
+        a.item_id,
+        COUNT( * ) AS num
         FROM
-            ta_check_item t
-            INNER JOIN ta_check c ON c.check_id = t.check_id
-            <if test="itemType != null and itemType == 'loc'">
-                INNER JOIN td_loc_type s ON t.type_id = s.type_id
-            </if>
-            LEFT JOIN (
-                SELECT
-                    a.item_id,
-                    COUNT( * ) AS num
-                FROM
-                    ta_check_answer a
-                WHERE
-                    a.check_id = #{checkId}
-                GROUP BY
-                    a.item_id
-            ) m ON m.item_id = t.item_id
+        ta_check_answer a
         WHERE
-            t.check_id = #{checkId}
-          AND t.item_type = #{itemType}
-          AND t.`status` &gt; -1
+        a.check_id = #{checkId}
+        GROUP BY
+        a.item_id
+        ) m ON m.item_id = t.item_id
+        WHERE
+        t.check_id = #{checkId}
+        AND t.item_type = #{itemType}
+        AND t.`status` &gt; -1
         ORDER BY
         <if test="itemType != null and itemType == 'loc'">
             s.sort_no ASC
@@ -93,53 +115,57 @@
     </select>
     <select id="getListBy" resultType="com.example.civilizedcity.entity.TaCheckItem">
         SELECT
-            t.*
+        t.*
         FROM
-            ta_check_item t
+        ta_check_item t
         WHERE
-            t.check_id = #{checkId}
-          AND t.item_type = #{itemType}
-          AND t.`status` &gt; -1
+        t.check_id = #{checkId}
+        AND t.item_type = #{itemType}
+        AND t.`status` &gt; -1
     </select>
     <select id="sumEvlScore" resultType="java.lang.Double">
         SELECT
         IF (
-            sum( m.cnt ) IS NULL OR sum( m.cnt ) = 0 , 0 , SUM( t.score ) / SUM( m.cnt )
-            ) as score
+        sum( m.cnt ) IS NULL OR sum( m.cnt ) = 0 , 0 , SUM( t.score ) / SUM( m.cnt )
+        ) as score
         FROM
         ta_check_item t
-            LEFT JOIN (
-                SELECT
-                    s.item_id,
-                    count(*) AS cnt
-                FROM
-                    ta_check_answer s
-                WHERE
-                    s.item_id = #{itemId}
-                ) m ON t.item_id = m.item_id
+        LEFT JOIN (
+        SELECT
+        s.item_id,
+        count(*) AS cnt
+        FROM
+        ta_check_answer s
+        WHERE
+        s.item_id = #{itemId}
+        ) m ON t.item_id = m.item_id
         WHERE t.item_id = #{itemId};
     </select>
     <select id="sumScore" resultType="java.lang.Double">
         SELECT
-            SUM( t.score )
+        SUM( t.score )
         FROM
-            ta_check_item t
+        ta_check_item t
         WHERE
-            t.check_id = #{checkId}
-          AND t.item_type = #{itemType}
-          AND t.`status` > - 1;
-</select>
+        t.check_id = #{checkId}
+        AND t.item_type = #{itemType}
+        AND t.`status` > - 1;
+    </select>
     <select id="getExportByCheck" resultType="com.example.civilizedcity.vo.CheckLocExport">
-
         SELECT
-            t.*,
-            t.full_score * t.num AS subtotal
+        t.*,
+        t.full_score * t.num AS subtotal,
+        l.sort_no
         FROM
-            ta_check_item t
+        ta_check_item t INNER JOIN td_loc_type l ON l.type_id=t.type_id
         WHERE
-            t.check_id = #{checkId}
-          AND t.item_type = #{itemType}
-          AND t.`status` &gt; -1
+        t.check_id = #{checkId}
+        AND t.item_type = #{itemType}
+        AND t.`status` &gt; -1
+        order by l.sort_no ASC
+
     </select>
 
+
+
 </mapper>

src/main/resources/mapper/TaCheckMapper.xml

@@ -24,6 +24,7 @@
                 count( 1 ) AS num
                 FROM
                 ta_check_item a
+                    INNER JOIN  ta_check_answer s ON s.item_id = a.item_id
                 WHERE
                 a.check_id = #{checkId}
                 AND a.item_type = 'survey'

src/main/resources/mapper/TaIssueMapper.xml

@@ -78,9 +78,9 @@
     <select id="statIssueOrg" resultType="java.util.Map">
         SELECT
             UUID_SHORT( ) AS id,
-            IFNULL( SUM( IF ( t.process_node = '03', t.process_num, 0 ) ), 0 ) AS endNum,
-            IFNULL( SUM( IF ( t.process_node LIKE '02%', t.process_num, 0 ) ), 0 ) AS assignedNum,
-            IFNULL( SUM( IF ( TO_DAYS(t.expire_date) &lt; TO_DAYS(NOW()) AND t.process_node != '03', t.process_num, 0 ) ), 0 ) AS expireNum
+            IFNULL( SUM( IF ( t.process_node = '03', 1, 0 ) ), 0 ) AS endNum,
+        IFNULL( SUM( IF ( TO_DAYS(t.expire_date) &gt;= TO_DAYS(NOW()) AND t.process_node  LIKE '02%', 1, 0 ) ), 0 )  AS assignedNum,
+        IFNULL( SUM( IF ( TO_DAYS(t.expire_date) &lt; TO_DAYS(NOW()) AND t.process_node  LIKE '02%', 1, 0 ) ), 0 ) AS expireNum
         FROM
             ta_issue t
         WHERE