1、评价管理调整

2、工资条导入调整

src/main/java/com/xjrsoft/module/evaluate/dto/AddEvaluateResultDto.java

@@ -34,4 +34,7 @@ public class AddEvaluateResultDto implements Serializable {
     @ApiModelProperty("建议/意见")
     private String opinion;
 
+    @ApiModelProperty("选项")
+    private String option;
+
 }

src/main/java/com/xjrsoft/module/evaluate/vo/EvaluateManageItemVo.java

@@ -69,4 +69,7 @@ public class EvaluateManageItemVo {
     @ApiModelProperty("选项内容")
     private String optionJson;
 
+    @ApiModelProperty("选项")
+    private String option;
+
 }

src/main/java/com/xjrsoft/module/personnel/controller/BasePersonnelLabourCapitalController.java

@@ -182,6 +182,12 @@ public class BasePersonnelLabourCapitalController {
             data.setIdType(datatMap.get(0) == null?null:datatMap.get(0).toString());
             data.setAmountTo(datatMap.get(4) == null?null:datatMap.get(4).toString());
             data.setJobNumber(datatMap.get(2) == null?null:datatMap.get(2).toString());
+            for (Integer integer : datatMap.keySet()) {
+                Object o = datatMap.get(integer);
+                if(o != null && o.toString().startsWith("(") && o.toString().endsWith(")")){
+                    datatMap.put(integer, "-" + o.toString().replace("(", "").replace(")", ""));
+                }
+            }
             String jsonString = JsonUtil.toJsonString(datatMap);
             jsonString = jsonString.replaceAll("- 0", "-");
             data.setExtendJson(jsonString);

src/main/java/com/xjrsoft/module/teacher/controller/TeacherAwardController.java

@@ -101,10 +101,10 @@ public class TeacherAwardController {
         return RT.ok(pageOutput);
     }
 
-    @GetMapping(value = "/export-query")
+    @PostMapping(value = "/export-query")
     @ApiOperation(value="导出")
     @SaCheckPermission("teacheraward:detail")
-    public ResponseEntity<byte[]> exportQuery(TeacherAwardStatisticsPageDto dto){
+    public ResponseEntity<byte[]> exportQuery(@Valid @RequestBody TeacherAwardStatisticsPageDto dto){
         List<TeacherAwardStatisticsPageVo> list = teacherAwardItemService.getStatisticsList(dto);
 
         List<Long> userIds = list.stream().map(TeacherAwardStatisticsPageVo::getId).collect(Collectors.toList());

src/main/resources/mapper/evaluate/EvaluateManageMapper.xml

@@ -172,7 +172,8 @@
                t1.score,
                t2.score AS actualScore,
                t2.opinion,
-               t1.input_not_null
+               t1.input_not_null,
+            t2.option_json as option
         FROM evaluate_submit_record t
                  LEFT JOIN evaluate_result t2 ON t2.submit_record_id = t.id
                  left join evaluate_manage_item t1 on t1.id = t2.evaluate_item_id