考评功能开发

zfjg-api/zfjg-api-manage/src/main/java/com/zfjg/manage/api/dto/enforce/job/EnforceDeductRecordDTO.java

@@ -2,6 +2,7 @@ package com.zfjg.manage.api.dto.enforce.job;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -41,6 +42,7 @@ public class EnforceDeductRecordDTO{
     private Double deductValue;
 
     @ApiModelProperty("扣分时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date deductTime;
 
     @ApiModelProperty("扣分情形次数")

zfjg-modules/zfjg-manage/src/main/java/com/zfjg/manage/controller/enforce/job/EnforceDeductSituationController.java

@@ -26,12 +26,13 @@ public class EnforceDeductSituationController {
 
     @ApiOperation(value="保存对象")
     @PostMapping("/enforceDeductSituation")
-    public R<Boolean> save(@RequestBody EnforceDeductSituation param) {
+    public R<Long> save(@RequestBody EnforceDeductSituation param) {
         SysUser user = SecurityUtils.getLoginUser().getSysUser();
         param.setCreateUserId(user.getUid());
         param.setCreateUserName(user.getUserName());
         param.setCreateTime(new Date());
-        return R.ok(enforceDeductSituationService.save(param));
+        enforceDeductSituationService.save(param);
+        return R.ok(param.getId());
     }
 
 //    @ApiOperation(value="根据id修改对象")

zfjg-modules/zfjg-manage/src/main/java/com/zfjg/manage/service/impl/enforce/job/EnforceDeductRecordServiceImpl.java

@@ -108,7 +108,9 @@ public class EnforceDeductRecordServiceImpl extends ServiceImpl<EnforceDeductRec
         List<EnforceDeductRecordSituation> list = enforceDeductRecordSituationService
                 .list(new LambdaQueryWrapper<EnforceDeductRecordSituation>()
                         .eq(EnforceDeductRecordSituation::getDeductRecordId, id));
-        record.setEnforceDeductRecordSituationList(list);
+        if (ObjectUtils.isNotEmpty(list)) {
+            record.setEnforceDeductRecordSituationList(list);
+        }
         return record;
     }
 

zfjg-modules/zfjg-manage/src/main/resources/mapper/enforce/job/EnforceDeductRecordMapper.xml

@@ -117,7 +117,7 @@
 
 
     <select id="selectWreportList" resultType="com.zfjg.manage.api.vo.enforce.job.WReportDeductVo">
-        select org_id,org_name,w_user,w_type_c,w_type_t,n_type_c,n_type_t,s_type_c,s_type_t from w_report
+        select id,org_id,org_name,w_user,w_type_c,w_type_t,n_type_c,n_type_t,s_type_c,s_type_t from w_report
         <where>
             <if test="pm.enforceOrgId  != null  and pm.enforceOrgId != ''">
                 and org_id = #{pm.enforceOrgId}