ZeroLiYi 1 рік тому
батько
коміт
46665c875a

+ 1 - 1
unis-plugin/unis-plugin-biz/src/main/java/com/unis/examine/modular/neassessmentScore/mapper/mapping/BizNeAssessmentScoreMapper.xml

@@ -3,7 +3,7 @@
3 3
 <mapper namespace="com.unis.examine.modular.neassessmentScore.mapper.BizNeAssessmentScoreMapper">
4 4
     <select id="selectMyMapsPage" resultType="com.unis.examine.modular.neassessmentScore.entity.VO.BizNeAssessmentScoreVO">
5 5
         SELECT
6
-        assessment_target_id,
6
+        assessment_target_id assessmentTargetId,
7 7
         target_no,
8 8
         score,
9 9
         MAX(CASE WHEN pc_type = '2' THEN score ELSE '' END) AS 'XNscore',

+ 3 - 12
unis-plugin/unis-plugin-biz/src/main/java/com/unis/examine/modular/neassessmentScore/service/impl/BizNeAssessmentScoreServiceImpl.java

@@ -189,17 +189,8 @@ public class BizNeAssessmentScoreServiceImpl extends ServiceImpl<BizNeAssessment
189 189
         int sum =0;
190 190
         int[] sumHolder = new int[]{0};
191 191
         for(BizNeAssessmentScorePageParam biz:bizNeAssessmentScorePageParams){
192
-//            Map<String, Integer> pcTypeMap = new HashMap<>();
193
-//            pcTypeMap.put("西宁市", 2);
194
-//            pcTypeMap.put("海东市", 3);
195
-//            pcTypeMap.put("海北州", 4);
196
-//            pcTypeMap.put("海西州", 5);
197
-//            pcTypeMap.put("海南州", 6);
198
-//            pcTypeMap.put("黄南州", 7);
199
-//            pcTypeMap.put("果洛州", 8);
200
-//            pcTypeMap.put("玉树州", 9);
201
-//
202
-//            Integer pcType = pcTypeMap.get(biz.getPcType());
192
+            BizNeAssessmentScore bizNeAssessmentScore1 = BeanUtil.toBean(biz, BizNeAssessmentScore.class);
193
+
203 194
             Integer pcType =biz.getPcType();
204 195
             Integer score =biz.getScore();
205 196
             Integer deduction =biz.getDeduction();
@@ -230,7 +221,7 @@ public class BizNeAssessmentScoreServiceImpl extends ServiceImpl<BizNeAssessment
230 221
                 handleSum(aMid, pcType, user, sumHolder);
231 222
 
232 223
             }else {
233
-                throw new CommonException("该条考核未进行评分,进填写后进行上传");
224
+                bizNeAssessmentScoreService.save(bizNeAssessmentScore1);
234 225
             }
235 226
         }
236 227