111

db/upgrade.1.1.sql

@@ -8,4 +8,5 @@ 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;
+

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/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/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_answer a
-                WHERE
-                    a.check_id = #{checkId}
-                GROUP BY
-                    a.item_id
-            ) m ON m.item_id = t.item_id
+        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
         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
         <if test="itemType != null and itemType == 'loc'">
             s.sort_no ASC
@@ -93,53 +115,55 @@
     </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
         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>
 
+
+
 </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