feats

db/.back_文明创办/文明创办-backup-2023217134109.pdma.json → db/.back_文明创办/文明创办-backup-2023228153135.pdma.json

@@ -4,7 +4,7 @@
   "avatar": "",
   "version": "4.1.4",
   "createdTime": "2022-12-12 09:36:12",
-  "updatedTime": "2023-2-16 16:03:34",
+  "updatedTime": "2023-2-28 11:17:54",
   "dbConns": [],
   "profile": {
     "default": {
@@ -4833,6 +4833,40 @@
           "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": "开始日期",
@@ -7195,7 +7229,7 @@
           "defName": "定位",
           "comment": "",
           "type": "VARCHAR",
-          "len": 32,
+          "len": 64,
           "scale": "",
           "primaryKey": false,
           "notNull": false,

db/文明创办.pdma.json

@@ -4,7 +4,7 @@
   "avatar": "",
   "version": "4.1.4",
   "createdTime": "2022-12-12 09:36:12",
-  "updatedTime": "2023-2-17 13:41:09",
+  "updatedTime": "2023-2-28 15:31:35",
   "dbConns": [],
   "profile": {
     "default": {
@@ -7229,7 +7229,7 @@
           "defName": "定位",
           "comment": "",
           "type": "VARCHAR",
-          "len": 32,
+          "len": 64,
           "scale": "",
           "primaryKey": false,
           "notNull": false,

pom.xml

@@ -10,7 +10,7 @@
     </parent>
     <groupId>com.example</groupId>
     <artifactId>civilizedCity</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
+    <version>0.0.3</version>
     <name>civilizedCity</name>
     <description>civilizedCity</description>
     <properties>
@@ -148,13 +148,13 @@
                             <artifactId>lombok</artifactId>
                         </exclude>
                     </excludes>
-                    <executions>
-                        <execution>
-                            <goals>
-                                <goal>repackage</goal>
-                            </goals>
-                        </execution>
-                    </executions>
+<!--                    <executions>-->
+<!--                        <execution>-->
+<!--                            <goals>-->
+<!--                                <goal>repackage</goal>-->
+<!--                            </goals>-->
+<!--                        </execution>-->
+<!--                    </executions>-->
                 </configuration>
             </plugin>
 

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

@@ -76,7 +76,7 @@ public class TaIssueController extends BaseController {
      * @param orgId
      * @return
      */
-    private QueryWrapper<TaIssue> buildQuery(SysUser sysUser, String bizStatus, String sourceType, String locId, Boolean mine, String orgId) {
+    private QueryWrapper<TaIssue> buildQuery(SysUser sysUser, String bizStatus, String sourceType, String locId, Boolean mine, String orgId, Boolean all) {
         QueryWrapper<TaIssue> queryWrapper = new QueryWrapper<>();
 
         if (Constants.PROCESS_START.equals(bizStatus)) {
@@ -107,8 +107,8 @@ public class TaIssueController extends BaseController {
 
         queryWrapper.eq(StringUtils.isNotEmpty(locId), "loc_id", locId);
         queryWrapper.eq(StringUtils.isNotEmpty(orgId), "org_id", orgId);
-        queryWrapper.eq(Constants.SOURCE_FEEDBACK.equals(sourceType), "source_type", Constants.SOURCE_FEEDBACK);
-        queryWrapper.ne(!Constants.SOURCE_FEEDBACK.equals(sourceType), "source_type", Constants.SOURCE_FEEDBACK);
+        queryWrapper.eq(Constants.SOURCE_FEEDBACK.equals(sourceType) && !all, "source_type", Constants.SOURCE_FEEDBACK);
+        queryWrapper.ne(!Constants.SOURCE_FEEDBACK.equals(sourceType) && !all, "source_type", Constants.SOURCE_FEEDBACK);
         queryWrapper.gt("status", Constants.STATUS_DELETE);
         queryWrapper.orderByDesc("create_date");
 
@@ -130,7 +130,8 @@ public class TaIssueController extends BaseController {
                              @ApiParam("来源") @RequestParam(value = "sourceType", required = false) String sourceType,
                              @ApiParam("点位") @RequestParam(value = "locId", required = false) String locId,
                              @ApiParam("我的") @RequestParam(value = "mine", defaultValue = "false") Boolean mine,
-                             @ApiParam("责任单位") @RequestParam(value = "orgId", required = false) String orgId) throws Exception {
+                             @ApiParam("责任单位") @RequestParam(value = "orgId", required = false) String orgId,
+                             @ApiParam("是否全部") @RequestParam(value = "all", defaultValue = "false") Boolean all) throws Exception {
 
         SysUser sysUser = currentUser();
         boolean isRooter = Constants.ROOT_ID.equals(sysUser.getUserId());
@@ -141,7 +142,7 @@ public class TaIssueController extends BaseController {
         }
 
         IPage<TaIssue> pg = new Page<>(pageNum, pageSize);
-        QueryWrapper<TaIssue> queryWrapper = buildQuery(sysUser, bizStatus, sourceType, locId, mine, orgId);
+        QueryWrapper<TaIssue> queryWrapper = buildQuery(sysUser, bizStatus, sourceType, locId, mine, orgId, all);
         IPage<TaIssue> result = taIssueService.page(pg, queryWrapper);
 
         return ResponseBean.success(result);
@@ -162,6 +163,7 @@ public class TaIssueController extends BaseController {
                                @ApiParam("点位") @RequestParam(value = "locId", required = false) String locId,
                                @ApiParam("我的") @RequestParam(value = "mine", defaultValue = "false") Boolean mine,
                                @ApiParam("责任单位") @RequestParam(value = "orgId", required = false) String orgId,
+                               @ApiParam("是否全部") @RequestParam(value = "all", defaultValue = "false") Boolean all,
                                HttpServletResponse response) throws Exception {
 
         SysUser sysUser = currentUser();
@@ -172,7 +174,7 @@ public class TaIssueController extends BaseController {
             return ResponseBean.error("暂无权限查询数据");
         }
 
-        QueryWrapper<TaIssue> queryWrapper = buildQuery(sysUser, bizStatus, sourceType, locId, mine, orgId);
+        QueryWrapper<TaIssue> queryWrapper = buildQuery(sysUser, bizStatus, sourceType, locId, mine, orgId, all);
         List<TaIssue> list = taIssueService.list(queryWrapper);
 
         if (null != list && list.size() > 0) {

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

@@ -25,6 +25,8 @@ public interface TaCheckAnswerMapper extends BaseMapper<TaCheckAnswer> {
 
     List<TaCheckAnswer> getListBy(@Param("itemId") String itemId);
 
+    List<TaCheckAnswer> getListByLimit(@Param("itemId") String itemId, @Param("limit") int limit);
+
     Double sumScore(@Param("itemId") String itemId, @Param("num") Integer num);
 
     int getCountByUser(@Param("itemId") String itemId, @Param("userId") String userId);

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

@@ -92,7 +92,7 @@ public class TaCheckServiceImpl extends BaseServiceImpl<TaCheckMapper, TaCheck>
         double totalScore = 0.0;
         for (TaCheckItem checkItem : checkItemList) {
             // 问卷份数
-            List<TaCheckAnswer> answerList = taCheckAnswerMapper.getListBy(checkItem.getItemId());
+            List<TaCheckAnswer> answerList = taCheckAnswerMapper.getListByLimit(checkItem.getItemId(), checkItem.getNum());
             if (answerList == null || answerList.size() == 0) continue;
             int copyNum = answerList.size();
 
@@ -113,7 +113,7 @@ public class TaCheckServiceImpl extends BaseServiceImpl<TaCheckMapper, TaCheck>
                 List<TaCheckAnswerItem> answerItemList = taCheckAnswerItemMapper.getListBy(answer.getAnswerId());
                 if (null == answerItemList || answerItemList.size() == 0) continue;
 
-                // 每题得分
+                // 每份试卷得分
                 double quScore = 0.0;
                 for (TaCheckAnswerItem answerItem : answerItemList) {
                     if (null == answerItem.getScore() || isZero(answerItem.getScore())) {
@@ -142,8 +142,9 @@ public class TaCheckServiceImpl extends BaseServiceImpl<TaCheckMapper, TaCheck>
                     quScore += s * ratio;
                 }
 
-                if (quScore > maxStandScore) {
-                    quScore = maxStandScore;
+                // 不能超过试卷的最大分数
+                if (quScore > maxItemScore) {
+                    quScore = maxItemScore;
                 }
 
                 answer.setScore(quScore);
@@ -153,12 +154,6 @@ public class TaCheckServiceImpl extends BaseServiceImpl<TaCheckMapper, TaCheck>
                 score += quScore;
             }
 
-            // 如果是正数, 那么就是试卷的得分
-            // 但是不能超过最大值
-            if (score > maxItemScore) {
-                score = maxItemScore;
-            }
-
             // 调查问卷理论上不会出现分数为负的情况
             if (score < 0) {
                 score = maxItemScore + score;

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

@@ -71,6 +71,7 @@ public class TaFeedbackServiceImpl extends BaseServiceImpl<TaFeedbackMapper, TaF
         taIssue.setProcessStatus(Constants.APPLY_READY); // 需要审核
         taIssue.setProcessNum(0);
         taIssue.setSourceType(Constants.SOURCE_FEEDBACK);
+        taIssue.setSourceTarget(taFeedback.getFeedbackId());
         taIssue.setStatus(Constants.STATUS_NORMAL);
         taIssue.setCreateUser(taFeedback.getPersonId());
         taIssue.setUserName(StringUtils.isEmpty(taFeedback.getName()) ? "市民" : taFeedback.getName());

src/main/resources/mapper/TaCheckAnswerMapper.xml

@@ -190,4 +190,14 @@
     <select id="getCheckList2By" resultType="com.example.civilizedcity.vo.CheckSurvey">
         <include refid="getCheckList"></include>
     </select>
+    <select id="getListByLimit" resultType="com.example.civilizedcity.entity.TaCheckAnswer">
+        SELECT
+            *
+        FROM
+            ta_check_answer t
+        WHERE
+            t.item_id = #{itemId}
+          AND t.`status` &gt; -1
+        LIMIT #{limit}
+    </select>
 </mapper>