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

db/.back_文明创办/文明创办-backup-2023323142510.pdma.json → db/.back_文明创办/文明创办-backup-202358163328.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-23 14:24:15",
+  "updatedTime": "2023-4-15 13:47:43",
   "dbConns": [],
   "profile": {
     "default": {
@@ -493,7 +493,9 @@
         "refKey": "extProps",
         "hideInGraph": true
       }
-    ]
+    ],
+    "modelType": "modalGroup",
+    "menuWidth": "250px"
   },
   "entities": [
     {
@@ -3911,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": [],
@@ -6477,6 +6496,23 @@
           "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": [],
@@ -7702,6 +7738,23 @@
           "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": [],

db/文明创办.pdma.json

@@ -2,9 +2,9 @@
   "name": "文明创办",
   "describe": "文明创办",
   "avatar": "",
-  "version": "4.1.1",
+  "version": "4.1.4",
   "createdTime": "2022-12-12 09:36:12",
-  "updatedTime": "2023-4-15 13:47:43",
+  "updatedTime": "2023-5-8 16:33:28",
   "dbConns": [],
   "profile": {
     "default": {
@@ -4937,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": "状态",

pom.xml

@@ -10,7 +10,7 @@
     </parent>
     <groupId>com.example</groupId>
     <artifactId>civilizedCity</artifactId>
-    <version>0.0.16</version>
+    <version>0.0.17</version>
     <name>civilizedCity</name>
     <description>civilizedCity</description>
     <properties>
@@ -76,7 +76,7 @@
         <dependency>
             <groupId>com.alibaba</groupId>
             <artifactId>easyexcel</artifactId>
-            <version>3.1.3</version>
+            <version>3.3.1</version>
         </dependency>
 
         <!--mybatis-plus start-->
@@ -158,6 +158,29 @@
                 </configuration>
             </plugin>
 
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-resources-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${project.build.directory}/config</outputDirectory>
+                            <resources>
+                                <resource>
+                                    <include>*.xlsx</include>
+                                    <include>application.yml</include>
+                                    <include>application-${profileActive}.yml</include>
+                                </resource>
+                            </resources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-dependency-plugin</artifactId>

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

@@ -6,10 +6,13 @@ import com.alibaba.excel.support.ExcelTypeEnum;
 import com.alibaba.excel.write.builder.ExcelWriterSheetBuilder;
 import com.alibaba.excel.write.handler.WriteHandler;
 import com.alibaba.excel.write.metadata.WriteSheet;
+import com.alibaba.excel.write.metadata.fill.FillConfig;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
+import java.io.InputStream;
 import java.util.List;
+import java.util.Map;
 
 public class ExcelUtils {
 
@@ -30,6 +33,33 @@ public class ExcelUtils {
         EasyExcel.write(response.getOutputStream(), dataClass).sheet("sheet1").doWrite(data);
     }
 
+
+
+    /**
+     * 发送 excel 到客户端
+     * 暂时只支持单 sheet 页
+     * @param response
+     * @param data
+     * @param fileName
+     * @throws IOException
+     */
+    public static void flushFile(HttpServletResponse response, InputStream tplFile, Class dataClass, List data, Map<String, Object> otherData, String fileName) throws IOException {
+        response.setContentType("application/vnd.ms-excel");
+        response.setCharacterEncoding("utf-8");
+        response.setHeader("Access-Control-Expose-Headers", "Content-Disposition");
+        response.setHeader("Content-Disposition", "attachment;filename="+StringUtils.urlEncode(fileName)+".xlsx");
+
+
+        ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream(), dataClass).withTemplate(tplFile).build();
+        WriteSheet writeSheet = EasyExcel.writerSheet().build();
+        FillConfig fillConfig1 = FillConfig.builder().forceNewRow(true).build();
+//        FillConfig fillConfig2 = FillConfig.builder().autoStyle(true).build();
+
+        excelWriter.fill(data, fillConfig1, writeSheet);
+        excelWriter.fill(otherData, writeSheet);
+        excelWriter.finish();
+    }
+
     /**
      * 导出, 支持复杂一点的自定义
      * @param response

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

@@ -7,14 +7,23 @@ import com.example.civilizedcity.common.*;
 import com.example.civilizedcity.entity.SysUser;
 import com.example.civilizedcity.entity.TaCheckItem;
 import com.example.civilizedcity.service.TaCheckItemService;
+import com.example.civilizedcity.vo.CheckLocExport;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 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;
+import java.io.InputStream;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 /**
  * 模拟测评;(ta_check)表控制层
  *
@@ -32,6 +41,9 @@ public class TaCheckController extends BaseController {
     @Autowired
     private TaCheckItemService taCheckItemService;
 
+    @Value("${yz.excel.tpl.check}")
+    String tplPath;
+
     /**
      * 通过ID查询单条数据
      *
@@ -112,6 +124,59 @@ public class TaCheckController extends BaseController {
     }
 
 
+    /**
+     * 导出实地测评
+     *
+     * @param taCheck 实例对象
+     * @return 实例对象
+     */
+    @ApiOperation("导出实地测评")
+    @PostMapping("/taCheck/{id}/loc/export")
+    public ResponseBean exportLoc(@ApiParam("对象ID") @PathVariable String id,
+                                  HttpServletResponse response) throws Exception {
+        TaCheck taCheck = taCheckService.getById(id);
+        List<CheckLocExport> list = taCheckItemService.getExportByCheck(id, Constants.CHECK_OF_LOC);
+        if (null == list) {
+            return ResponseBean.error("当前测评数据不正确");
+        }
+
+        Double totalFullScore = 0.0;
+        Integer totalAnswerNum = 0;
+        Integer totalNum = 0;
+        Double totalSubtotal = 0.0;
+        Double totalScore = 0.0;
+
+        for (CheckLocExport item : list) {
+            totalFullScore += getVal(item.getFullScore());
+            totalAnswerNum += getVal(item.getAnswerNum());
+            totalNum += getVal(item.getNum());
+            totalSubtotal += getVal(item.getSubtotal());
+            totalScore += getVal(item.getScore());
+        }
+
+        String title = taCheck.getTitle() + " 实地测评";
+        Map<String, Object> map = new HashMap<>();
+        map.put("totalFullScore", totalFullScore);
+        map.put("totalAnswerNum", totalAnswerNum);
+        map.put("totalNum", totalNum);
+        map.put("totalSubtotal", totalSubtotal);
+        map.put("totalScore", totalScore);
+        map.put("title", title);
+
+        InputStream tpl = new FileInputStream(tplPath);
+        ExcelUtils.flushFile(response, tpl, CheckLocExport.class, list, map, title);
+
+        return null;
+    }
+
+    private Double getVal(Double d) {
+        return null == d ? 0.0 : d;
+    }
+    private Integer getVal(Integer d) {
+        return null == d ? 0 : d;
+    }
+
+
     /**
      * 复制
      *

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

@@ -39,6 +39,12 @@ public class TaCheck implements Serializable,Cloneable{
        /** 调查问卷得分 */
        @ApiModelProperty(name = "调查问卷得分",notes = "")
        private Double surveyScore ;
+     /** 实地测评得分 */
+     @ApiModelProperty(name = "实地测评份数",notes = "")
+     private Integer locNum ;
+     /** 调查问卷得分 */
+     @ApiModelProperty(name = "调查问卷份数",notes = "")
+     private Integer surveyNum ;
      /** 实地测评得分占比 */
      @ApiModelProperty(name = "实地测评得分占比",notes = "")
      private Double locScorePercent ;

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.example.civilizedcity.entity.SysUser;
 import com.example.civilizedcity.entity.TaCheck;
+import com.example.civilizedcity.vo.CheckLocExport;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import com.example.civilizedcity.entity.TaCheckItem;
@@ -28,11 +29,13 @@ public interface TaCheckItemMapper  extends BaseMapper<TaCheckItem>{
 
     long copyItems(@Param("oldCheckId") String oldCheckId, @Param("newCheckId") String newCheckId);
 
-    double sumScore(@Param("checkId") String checkId, @Param("itemType") String itemType);
+    Double sumScore(@Param("checkId") String checkId, @Param("itemType") String itemType);
 
     double sumEvlScore(@Param("itemId") String itemId);
 
     boolean updateFullScore(@Param("itemId") String itemId);
 
     int calcScore(@Param("checkId") String checkId);
+
+    List<CheckLocExport> getExportByCheck(@Param("checkId") String checkId, @Param("itemType") String itemType);
 }

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

@@ -3,13 +3,15 @@ package com.example.civilizedcity.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 import com.example.civilizedcity.entity.TaCheck;
+import org.apache.ibatis.annotations.Param;
 
- /**
+/**
  * 模拟测评;(ta_mock_check)表数据库访问层
  * @author : http://njyunzhi.com
  * @date : 2022-12-12
  */
 @Mapper
 public interface TaCheckMapper extends BaseMapper<TaCheck>{
-    
-}
+
+     int updateScore(@Param("checkId") String checkId);
+ }

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

@@ -5,8 +5,11 @@ import com.example.civilizedcity.entity.SysUser;
 import com.example.civilizedcity.entity.TaCheck;
 import com.example.civilizedcity.entity.TaCheckAnswer;
 import com.example.civilizedcity.entity.TaCheckItem;
+import com.example.civilizedcity.vo.CheckLocExport;
 
- /**
+import java.util.List;
+
+/**
  * 测评点位;(ta_check_item)表服务接口
  * @author : http://njyunzhi.com
  * @date : 2022-12-13
@@ -20,4 +23,6 @@ public interface TaCheckItemService extends IBaseService<TaCheckItem> {
      void answer(TaCheckItem taCheckItem, TaCheckAnswer taCheckAnswer, SysUser sysUser) throws Exception;
 
      boolean updateFullScore(String itemId);
+
+     List<CheckLocExport> getExportByCheck(String checkId, String itemType);
  }

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

@@ -6,6 +6,7 @@ import com.example.civilizedcity.common.NumberUtil;
 import com.example.civilizedcity.common.StringUtils;
 import com.example.civilizedcity.entity.*;
 import com.example.civilizedcity.mapper.*;
+import com.example.civilizedcity.vo.CheckLocExport;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.example.civilizedcity.service.TaCheckItemService;
@@ -117,6 +118,11 @@ public class TaCheckItemServiceImpl extends BaseServiceImpl<TaCheckItemMapper, T
         return baseMapper.updateFullScore(itemId);
     }
 
+    @Override
+    public List<CheckLocExport> getExportByCheck(String checkId, String itemType) {
+        return baseMapper.getExportByCheck(checkId, itemType);
+    }
+
     /**
      * 作答计算分数
      * 试卷总分 = 每一题分数求和

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

@@ -39,16 +39,24 @@ public class TaCheckServiceImpl extends BaseServiceImpl<TaCheckMapper, TaCheck>
 
         taCheckItemMapper.calcScore(taCheck.getCheckId());
 
-        // 调查问卷分数
-        double surveyScore = taCheckItemMapper.sumScore(taCheck.getCheckId(), Constants.CHECK_OF_SURVEY);
-
-        // 计算点位分数
-        double locScore = taCheckItemMapper.sumScore(taCheck.getCheckId(), Constants.CHECK_OF_LOC);
-
-        taCheck.setLocScore(locScore);
-        taCheck.setSurveyScore(surveyScore);
-
-        updateById(taCheck);
+        baseMapper.updateScore(taCheck.getCheckId());
+
+//        // 调查问卷分数
+//        Double surveyScore = taCheckItemMapper.sumScore(taCheck.getCheckId(), Constants.CHECK_OF_SURVEY);
+//        if (surveyScore == null) {
+//            surveyScore = 0.0;
+//        }
+//
+//        // 计算点位分数
+//        Double locScore = taCheckItemMapper.sumScore(taCheck.getCheckId(), Constants.CHECK_OF_LOC);
+//        if (locScore == null) {
+//            locScore = 0.0;
+//        }
+//
+//        taCheck.setLocScore(locScore);
+//        taCheck.setSurveyScore(surveyScore);
+//
+//        updateById(taCheck);
 
         return taCheck;
     }

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

@@ -0,0 +1,9 @@
+package com.example.civilizedcity.vo;
+
+import com.example.civilizedcity.entity.TaCheckItem;
+import lombok.Data;
+
+@Data
+public class CheckLocExport extends TaCheckItem {
+    Double subtotal;
+}

src/main/resources/application-dev.yml

@@ -24,6 +24,9 @@ yz:
   upload:
     path: E:\work\public-upload
     prefix: http://127.0.0.1:8000
+  excel:
+    tpl:
+      check: E:\work\civilized_city\service\src\main\resources\check_tpl.xlsx
 
 wx:
   miniapp:

src/main/resources/mapper/TaCheckItemMapper.xml

@@ -129,5 +129,17 @@
           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
+        FROM
+            ta_check_item t
+        WHERE
+            t.check_id = #{checkId}
+          AND t.item_type = #{itemType}
+          AND t.`status` &gt; -1
+    </select>
 
 </mapper>

src/main/resources/mapper/TaCheckMapper.xml

@@ -2,5 +2,38 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
 <mapper namespace="com.example.civilizedcity.mapper.TaCheckMapper">
-    
+
+    <update id="updateScore">
+        UPDATE ta_check t
+            INNER JOIN (
+                SELECT
+                a.check_id,
+                sum( a.score ) AS score,
+                count( 1 ) AS num
+                FROM
+                ta_check_item a
+                WHERE
+                a.check_id = #{checkId}
+                AND a.item_type = 'loc'
+                AND a.`status` = 1
+            ) m ON m.check_id = t.check_id
+            INNER JOIN (
+                SELECT
+                a.check_id,
+                sum( a.score ) AS score,
+                count( 1 ) AS num
+                FROM
+                ta_check_item a
+                WHERE
+                a.check_id = #{checkId}
+                AND a.item_type = 'survey'
+                AND a.`status` = 1
+            ) n ON n.check_id = t.check_id
+            SET t.loc_score = m.score,
+                t.loc_num = m.num,
+                t.survey_score = n.score,
+                t.survey_num = n.num
+        WHERE
+            t.check_id = #{checkId}
+    </update>
 </mapper>