Переглянути джерело

樊莉修改合同案卷号

sangwenwei 5 місяців тому
батько
коміт
3f9e8c4462

+ 5 - 0
jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/contractRegistration/controller/ContractInfoController.java

@@ -82,6 +82,11 @@ public class ContractInfoController {
         String id = service.saveInfo(info);
         return ResponseUtil.newInstance().add("businessTable", "cw_work_contract_info").add("businessId", id).ok ("操作成功");
     }
+    @ApiOperation(value = "案卷号修改")
+    @PostMapping(value = "updateFileNumber")
+    public void updateFileNumber(@RequestBody ContractInfo info){
+        service.updateFileNumber(info);
+    }
 
     /**
      * 合同登记信息删除

+ 2 - 0
jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/contractRegistration/mapper/ContractFilePaperMapper.java

@@ -36,4 +36,6 @@ public interface ContractFilePaperMapper extends BaseMapper<ContractFilePaper> {
      * 根据attachmentId删除上传文件信息
      */
     void deleteFileInfo(String attachmentId);
+    @InterceptorIgnore(tenantLine = "true")
+    void updateFileNumber(@Param("filedNo")String filedNo, @Param("id")String id);
 }

+ 4 - 0
jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/contractRegistration/mapper/xml/ContractFilePaperMapper.xml

@@ -28,5 +28,9 @@
 			AND attachment_id in (#{id}, #{contractInfoId})
 			AND attachment_name = #{name}
     </select>
+    <update id="updateFileNumber">
+        UPDATE cw_work_contract_file_paper SET filed_no = #{filedNo}
+        WHERE del_flag = 0 AND contract_info_id = #{id}
+    </update>
 
 </mapper>

+ 5 - 0
jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/contractRegistration/service/ContractInfoService.java

@@ -896,4 +896,9 @@ public class ContractInfoService {
         }
         return new ArrayList<>();
     }
+
+    //案卷号修改
+    public void updateFileNumber(ContractInfo info) {
+        paperMapper.updateFileNumber(info.getFiledNo(),info.getId());
+    }
 }

+ 11 - 1
jeeplus-modules/jeeplus-test/src/main/java/com/jeeplus/test/dingding/controller/DingdingAddressBookController.java

@@ -83,7 +83,7 @@ public class DingdingAddressBookController {
             OapiAttendanceGetattcolumnsResponse rsp1 = client1.execute(req1, token);
             ArrayList<OapiAttendanceGetattcolumnsResponse.ColumnForTopVo> arrayList = new ArrayList<>();
             for (OapiAttendanceGetattcolumnsResponse.ColumnForTopVo column : rsp1.getResult().getColumns()) {
-                if (column.getName().equals("应出勤天数") || column.getName().equals("出勤天数") || column.getName().equals("休息天数")){
+                if (column.getName().equals("应出勤天数") || column.getName().equals("出勤天数") || column.getName().equals("休息天数") || column.getName().equals("迟到次数")){
                     arrayList.add(column);
                 }
             }
@@ -97,6 +97,7 @@ public class DingdingAddressBookController {
                 String requiredAttDays ="";//应出勤天数
                 String attDays = "";//出勤天数
                 String restDays = "";//休息天数
+                String lateTimes = "";//迟到次数
                 OapiAttendanceGetcolumnvalResponse attRsp = getAttById(user.getUserid(), typeIds, dateFrom, dateTo);
                 //根据考勤信息列获取里面的数据
                 for (OapiAttendanceGetcolumnvalResponse.ColumnValForTopVo columnVal : attRsp.getResult().getColumnVals()) {
@@ -126,11 +127,20 @@ public class DingdingAddressBookController {
                             }
                             restDays = String.valueOf(days);
                         }
+                        if (columnForTopVo.getId().equals(columnVal.getColumnVo().getId()) && columnForTopVo.getName().equals("迟到次数")){
+                            double days = 0;
+                            for (OapiAttendanceGetcolumnvalResponse.ColumnDayAndVal val : columnVal.getColumnVals()) {
+                                double v = Double.parseDouble(val.getValue());
+                                days += v;
+                            }
+                            lateTimes = String.valueOf(days);
+                        }
                     }
                 }
                 ddUserDTO.setAttDays(attDays);
                 ddUserDTO.setRequiredAttDays(requiredAttDays);
                 ddUserDTO.setRestDays(restDays);
+                ddUserDTO.setLateTimes(lateTimes);
 
                 userDTOS.add(ddUserDTO);
             }

+ 1 - 0
jeeplus-modules/jeeplus-test/src/main/java/com/jeeplus/test/dingding/dto/DdUserDTO.java

@@ -16,4 +16,5 @@ public class DdUserDTO {
     private String attDays; //出勤天数
 
     private String restDays; //休息天数
+    private String lateTimes; //迟到次数
 }