Merge remote-tracking branch 'origin/master'

jeeplus-modules/jeeplus-assess/src/main/java/com/jeeplus/assess/program/configuration/projectList/controller/ProjectListController.java

@@ -133,7 +133,7 @@ public class ProjectListController {
      */
     @ApiOperation(value = "根据id查询")
     @GetMapping(value = "/findById")
-    public ResponseEntity<ProjectListDto> save(@RequestParam String id){
+    public ResponseEntity<ProjectListDto> findById(@RequestParam String id){
         ProjectListDto dto = projectListService.findById(id);
         return ResponseEntity.ok(dto);
     }
@@ -662,4 +662,17 @@ public class ProjectListController {
     public ResponseEntity<ProgramAuditDto> findByProIdAndLevel(String programId, String auditLevel) {
         return projectListService.findByProIdAndLevel(programId, auditLevel);
     }
+
+    /**
+     * 补充内容保存方法
+     */
+    @ApiOperation(value = "补充内容保存方法")
+    @PostMapping(value = "/supplementSave")
+    public ResponseEntity<String> supplementSave(@RequestBody ProjectListDto projectListDto) throws Exception{
+        String id = projectListService.supplementSave(projectListDto);
+        if("0".equals(id)){
+            return ResponseEntity.badRequest ( ).body ( "保存失败!" );
+        }
+        return ResponseEntity.ok("操作成功");
+    }
 }

jeeplus-modules/jeeplus-assess/src/main/java/com/jeeplus/assess/program/configuration/projectList/domain/ProgramProjectListInfo.java

@@ -455,6 +455,12 @@ public class ProgramProjectListInfo extends BaseEntity {
     @TableField(exist = false)
     private String isPapersArchive;
 
+    /**
+     * 年份
+     */
+    @TableField(exist = false)
+    private String year;
+
 
 
 }

jeeplus-modules/jeeplus-assess/src/main/java/com/jeeplus/assess/program/configuration/projectList/mapper/ProgramArchiveMapper.java

@@ -15,6 +15,14 @@ public interface ProgramArchiveMapper extends BaseMapper<ProgramArchive> {
     ProgramArchiveDto findByIdArchive(String id);
 
     /**
+     * 根据项目id查询归档信息
+     * @param programId
+     * @return
+     */
+    @InterceptorIgnore(tenantLine = "true")
+    ProgramArchiveDto getByProgramId(String programId);
+
+    /**
      * 根据项目id查询信息
      * @param id
      * @return

jeeplus-modules/jeeplus-assess/src/main/java/com/jeeplus/assess/program/configuration/projectList/mapper/ProjectListMapper.java

@@ -32,7 +32,7 @@ public interface ProjectListMapper extends BaseMapper<ProgramProjectListInfo> {
     void updateStatusById(@Param("id")String id, @Param("status")String status);
 
     //@InterceptorIgnore(tenantLine = "true")
-    IPage<ProgramProjectListInfo> findPageList(Page<ProgramProjectListInfo> page, @Param(Constants.WRAPPER) QueryWrapper<ProgramProjectListInfo> wrapper);
+    IPage<ProgramProjectListInfo> findPageList(Page<ProgramProjectListInfo> page, @Param(Constants.WRAPPER) QueryWrapper<ProgramProjectListInfo> wrapper,@Param("userId") String userId);
     /**
      * 项目登记列表,和上面findPageList接口是一样的，目的时跳过findPageList mapper接口的数据规则（比如仅部门可见、仅自己可见之类的）
      */

jeeplus-modules/jeeplus-assess/src/main/java/com/jeeplus/assess/program/configuration/projectList/mapper/xml/ProgramArchiveMapper.xml

@@ -165,6 +165,16 @@
         left join program_report_no prn on prn.program_id = pa.program_id and prn.del_flag = '0'
         where pa.del_flag = '0' and pa.id = #{id}
     </select>
+    <select id="getByProgramId" resultMap="BaseResultMap">
+        select
+        <include refid="Base_Column_List"></include>,
+        prn.report_no as report_no
+        from program_archive pa
+        left join program_report_no prn on prn.program_id = pa.program_id and prn.del_flag = '0'
+        where pa.del_flag = '0' and pa.program_id = #{programId}
+        order by pa.update_time desc
+        limit 1
+    </select>
     <select id="findByProgramIdArchive" resultMap="BaseResultMap">
         select
         <include refid="Base_Column_List"></include>,

jeeplus-modules/jeeplus-assess/src/main/java/com/jeeplus/assess/program/configuration/projectList/mapper/xml/ProjectListMapper.xml

@@ -150,6 +150,7 @@
            pa.is_contract_archive,
            pa.is_papers_archive,
            pa.is_invoice,
+           pa.year,
            d.id AS issued_id,
            d.proc_ins_id AS procInsId4,
            ifnull(d.status,"0") as issued_status,
@@ -179,7 +180,7 @@
             LEFT JOIN act_ru_task artd ON d.proc_ins_id = artd.PROC_INST_ID_
             LEFT JOIN act_ru_task art_archive ON pa.proc_ins_id = art_archive.PROC_INST_ID_
             ${ew.customSqlSegment}
-            ORDER BY a.create_time DESC
+            ORDER BY a.create_by_id = #{userId} desc,a.assessment_objective='' desc, a.create_time DESC
     </select>
     <select id="findPageList2" resultType="com.jeeplus.assess.program.configuration.projectList.domain.ProgramProjectListInfo">
         SELECT
@@ -559,6 +560,20 @@
            pa.status as archive_status,
            pa.id as archive_id,
            pa.proc_ins_id as procInsIdArchive,
+
+           pa.evaluation_report_date as evaluationReportDate,
+           pa.signature_evaluator_first,
+           pa.signature_evaluator_second,
+           pa.fixed_assets_evaluation,
+           pa.net_assets_evaluation,
+           pa.wayst_evaluation,
+           pa.rent_evaluation,
+           pa.report_charges,
+           pa.is_contract_archive,
+           pa.is_papers_archive,
+           pa.is_invoice,
+           pa.year,
+
            d.id AS issued_id,
            d.proc_ins_id AS procInsId4,
            d.status AS issued_status

jeeplus-modules/jeeplus-assess/src/main/java/com/jeeplus/assess/program/configuration/projectList/service/ProjectListService.java

@@ -724,6 +724,7 @@ public class ProjectListService {
     }
 
     public IPage<ProgramProjectListInfo> list(Page<ProgramProjectListInfo> page, ProgramProjectListInfo info, String tabType) throws Exception{
+        String userId = SpringUtil.getBean ( IUserApi.class ).getByToken (TokenProvider.getCurrentToken ( )).getId();
         QueryWrapper<ProgramProjectListInfo> wrapper = QueryWrapperGenerator.buildQueryCondition(info, ProgramProjectListInfo.class);
         if (ObjectUtil.isNotEmpty(info) && StringUtils.isNotBlank(info.getCreateById())) {
             wrapper.eq("a.create_by_id", info.getCreateById());
@@ -773,7 +774,7 @@ public class ProjectListService {
                 break;
             }
         }*/
-        IPage<ProgramProjectListInfo> pageList = projectListMapper.findPageList(page, wrapper);
+        IPage<ProgramProjectListInfo> pageList = projectListMapper.findPageList(page, wrapper,userId);
         pageList.getRecords().stream().forEach(item ->{
             // 查询关联发票的开票状态
             if (StringUtils.isNotBlank(info.getShowInvoiceFlag()) && "1".equals(info.getShowInvoiceFlag())) {
@@ -1867,4 +1868,50 @@ public class ProjectListService {
         }
         return ResponseEntity.ok(byIdAudit);
     }
+
+    /**
+     * 补充内容保存方法
+     * @param dto
+     * @return
+     * @throws Exception
+     */
+    public String supplementSave(ProjectListDto dto){
+        if (StringUtils.isNotEmpty(dto.getId())) {
+            //获取当前登录人信息
+            UserDTO userDTO = SpringUtil.getBean ( IUserApi.class ).getByToken(TokenProvider.getCurrentToken());
+            // 修改项目管理列表主表信息
+            ProgramProjectListInfo info = new ProgramProjectListInfo();
+            BeanUtils.copyProperties(dto, info);
+            info.setUpdateById(userDTO.getId());
+            info.setUpdateTime(new Date());
+            info.setDelFlag(0);
+            projectListMapper.updateById(info);
+
+            //根据项目id查询归档信息
+            ProgramArchiveDto archiveInfo = programArchiveMapper.getByProgramId(dto.getId());
+            if(null != archiveInfo && StringUtils.isNotBlank(archiveInfo.getId())){
+                //根据项目id修改归档信息
+                ProgramArchive programArchive = new ProgramArchive();
+                programArchive.setId(archiveInfo.getId());
+                programArchive.setEvaluationReportDate(dto.getEvaluationReportDate());
+                programArchive.setSignatureEvaluatorFirst(dto.getSignatureEvaluatorFirst());
+                programArchive.setSignatureEvaluatorSecond(dto.getSignatureEvaluatorSecond());
+                programArchive.setWaystEvaluation(dto.getWaystEvaluation());
+                programArchive.setFixedAssetsEvaluation(dto.getFixedAssetsEvaluation());
+                programArchive.setNetAssetsEvaluation(dto.getNetAssetsEvaluation());
+                programArchive.setRentEvaluation(dto.getRentEvaluation());
+                programArchive.setReportCharges(dto.getReportCharges());
+                programArchive.setIsInvoice(dto.getIsInvoice());
+                programArchive.setIsContractArchive(dto.getIsContractArchive());
+                programArchive.setIsPapersArchive(dto.getIsPapersArchive());
+                programArchive.setYear(dto.getYear());
+                programArchiveMapper.updateById(programArchive);
+            }else{
+                return "0";
+            }
+
+            return "1";
+        }
+        return "0";
+    }
 }

jeeplus-modules/jeeplus-assess/src/main/java/com/jeeplus/assess/program/configuration/projectList/service/dto/ProjectListDto.java

@@ -163,4 +163,17 @@ public class ProjectListDto extends BaseEntity {
      */
     private String createContractNo;
 
+    private Date evaluationReportDate;	//评估报告日
+    private String signatureEvaluatorFirst;	//签字评估师1
+    private String signatureEvaluatorSecond;	//签字评估师2
+    private String waystEvaluation;	//废旧物资评估值
+    private String fixedAssetsEvaluation;	//固定资产评估值
+    private String netAssetsEvaluation;	//净资产评估值
+    private String rentEvaluation;	//租金评估
+    private String reportCharges;	//报告收费
+    private String isInvoice;	//是否开票
+    private String isContractArchive;	//合同是否存档
+    private String isPapersArchive;	//底稿是否存档
+    private String year;	//年份
+
 }

jeeplus-modules/jeeplus-assess/src/main/java/com/jeeplus/assess/reimbursement/reimbursementInfo/service/ReimbursementInfoService.java

@@ -544,7 +544,7 @@ public class ReimbursementInfoService {
         }*/
         // 修改附件信息列表
         if (CollectionUtils.isNotEmpty(dto.getFiles())) {
-            workContractService.updateFiles(dto.getFiles(), userDTO, dto.getId());
+            workContractService.updateFiles(dto.getFiles(), userDTO, dto.getId(),"workcontract");
         }
         return info;
     }

jeeplus-modules/jeeplus-assess/src/main/java/com/jeeplus/assess/workContract/mapper/WorkContractInfoMapper.java

@@ -29,6 +29,14 @@ public interface WorkContractInfoMapper extends BaseMapper<WorkContractInfo> {
     @InterceptorIgnore(tenantLine = "true")
     List<WorkAttachmentInfo> findList(@Param("id") String id);
 
+    /**
+     * 根据AttachmentFla 和AttachmentId 查询附件信息
+     * @param id
+     * @param attachmentFlag
+     * @return
+     */
+    List<WorkAttachmentInfo> findListByIdAndAttachmentFlag(@Param("id") String id, @Param("attachmentFlag")String attachmentFlag);
+
     @InterceptorIgnore(tenantLine = "true")
     List<WorkAttachmentInfo> findDtos(@Param("id") String id);
 

jeeplus-modules/jeeplus-assess/src/main/java/com/jeeplus/assess/workContract/mapper/xml/WorkContractInfoMapper.xml

@@ -108,6 +108,9 @@
 	<select id="findList" resultType="com.jeeplus.sys.domain.WorkAttachmentInfo">
 		SELECT * FROM work_attachment WHERE del_flag = 0 AND attachment_id = #{id}
 	</select>
+	<select id="findListByIdAndAttachmentFlag" resultType="com.jeeplus.sys.domain.WorkAttachmentInfo">
+		SELECT * FROM work_attachment WHERE del_flag = 0 AND attachment_id = #{id} and attachment_flag = #{attachmentFlag}
+	</select>
 
 	<select id="findDtos" resultType="com.jeeplus.sys.domain.WorkAttachmentInfo">
 		SELECT

jeeplus-modules/jeeplus-assess/src/main/java/com/jeeplus/assess/workContract/service/WorkContractService.java

@@ -385,7 +385,7 @@ public class WorkContractService {
             names = names + "," +dto.getUrl();
         }
         //查询保存的附件信息
-        List<WorkAttachmentInfo> infoList = workContractInfoMapper.findList(id);
+        List<WorkAttachmentInfo> infoList = workContractInfoMapper.findListByIdAndAttachmentFlag(id,attachmentFlag);
         if (CollectionUtil.isNotEmpty(infoList)) {
             for (WorkAttachmentInfo i : infoList) {
                 if (!names.contains(i.getUrl())) {

jeeplus-modules/jeeplus-centrecareful/src/main/java/com/jeeplus/centrecareful/approvalInfo/service/ZsReimbursementInfoService.java

@@ -512,7 +512,7 @@ public class ZsReimbursementInfoService {
         }*/
         // 修改附件信息列表
         if (CollectionUtils.isNotEmpty(dto.getFiles())) {
-            typeService.updateFiles(dto.getFiles(), userDTO, dto.getId());
+            typeService.updateFiles(dto.getFiles(), userDTO, dto.getId(),"cwWorkContract");
         }
         return info;
     }

jeeplus-modules/jeeplus-centrecareful/src/main/java/com/jeeplus/centrecareful/approvalType/mapper/ZsReimbursementTypeMapper.java

@@ -38,6 +38,14 @@ public interface ZsReimbursementTypeMapper extends BaseMapper<ZsReimbursementTyp
     List<ZsReimbursementTypeInfo> getAllList(String type);
     @InterceptorIgnore(tenantLine = "true")
     List<WorkAttachmentInfo> findList(@Param("id") String id);
+
+    /**
+     * 根据AttachmentFla 和AttachmentId 查询附件信息
+     * @param id
+     * @param attachmentFlag
+     * @return
+     */
+    List<WorkAttachmentInfo> findListByIdAndAttachmentFlag(@Param("id") String id, @Param("attachmentFlag")String attachmentFlag);
     @InterceptorIgnore(tenantLine = "true")
     Integer findIsExit(@Param("id") String id, @Param("name")String name);
 }

jeeplus-modules/jeeplus-centrecareful/src/main/java/com/jeeplus/centrecareful/approvalType/mapper/xml/ZsReimbursementTypeMapper.xml

@@ -39,6 +39,9 @@
     <select id="findList" resultType="com.jeeplus.sys.domain.WorkAttachmentInfo">
 		SELECT * FROM work_attachment WHERE del_flag = 0 AND attachment_id = #{id}
 	</select>
+    <select id="findListByIdAndAttachmentFlag" resultType="com.jeeplus.sys.domain.WorkAttachmentInfo">
+		SELECT * FROM work_attachment WHERE del_flag = 0 AND attachment_id = #{id} and attachment_flag = #{attachmentFlag}
+	</select>
 	<select id="findIsExit" resultType="java.lang.Integer">
 		SELECT
 			COUNT( 0 )

jeeplus-modules/jeeplus-centrecareful/src/main/java/com/jeeplus/centrecareful/approvalType/service/ZsReimbursementTypeService.java

@@ -251,7 +251,7 @@ public class ZsReimbursementTypeService {
             names = names + "," +dto.getUrl();
         }
         //查询保存的附件信息
-        List<WorkAttachmentInfo> infoList = mapper.findList(id);
+        List<WorkAttachmentInfo> infoList = mapper.findListByIdAndAttachmentFlag(id,attachmentFlag);
         if (CollectionUtils.isNotEmpty(infoList)) {
             for (WorkAttachmentInfo i : infoList) {
                 if (!names.contains(i.getUrl())) {

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/contractRegistration/mapper/ContractInfoMapper.java

@@ -43,6 +43,14 @@ public interface ContractInfoMapper extends BaseMapper<ContractInfo> {
 
     List<WorkAttachmentInfo> findList(@Param("id") String id);
 
+    /**
+     * 根据AttachmentFla 和AttachmentId 查询附件信息
+     * @param id
+     * @param attachmentFlag
+     * @return
+     */
+    List<WorkAttachmentInfo> findListByIdAndAttachmentFlag(@Param("id") String id, @Param("attachmentFlag")String attachmentFlag);
+
     Integer findIsExit(@Param("id") String id, @Param("name")String name);
 
     /**

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/contractRegistration/mapper/xml/ContractInfoMapper.xml

@@ -145,6 +145,9 @@
     <select id="findList" resultType="com.jeeplus.sys.domain.WorkAttachmentInfo">
         SELECT * FROM work_attachment WHERE del_flag = 0 AND attachment_id = #{id}
     </select>
+    <select id="findListByIdAndAttachmentFlag" resultType="com.jeeplus.sys.domain.WorkAttachmentInfo">
+		SELECT * FROM work_attachment WHERE del_flag = 0 AND attachment_id = #{id} and attachment_flag = #{attachmentFlag}
+	</select>
     <select id="findIsExit" resultType="java.lang.Integer">
         SELECT
 			COUNT( 0 )

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

@@ -799,7 +799,7 @@ public class ContractInfoService {
             names = names + "," +dto.getUrl();
         }
         //查询保存的附件信息
-        List<WorkAttachmentInfo> infoList = mapper.findList(id);
+        List<WorkAttachmentInfo> infoList = mapper.findListByIdAndAttachmentFlag(id,attachmentFlag);
         if (CollectionUtils.isNotEmpty(infoList)) {
             for (WorkAttachmentInfo i : infoList) {
                 if (!names.contains(i.getUrl())) {

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectReportArchive/service/CwProjectReportArchiveDetailService.java

@@ -14,6 +14,7 @@ import com.jeeplus.finance.projectReport.mapper.CwProjectInfoMapper;
 import com.jeeplus.finance.projectReportArchive.domain.CwProjectReportArchiveDetail;
 import com.jeeplus.finance.projectReportArchive.mapper.CwProjectReportArchiveDetailMapper;
 import com.jeeplus.finance.projectReportArchive.mapper.CwProjectReportArchiveReportMapper;
+import com.jeeplus.finance.projectReportArchive.service.dto.CwProjectReportArchiveDTO;
 import com.jeeplus.finance.projectReportArchive.service.dto.CwProjectReportArchiveDetailDTO;
 import com.jeeplus.finance.projectReportArchive.service.mapstruct.CwProjectReportArchiveDetailWrapper;
 import com.jeeplus.sys.domain.User;
@@ -93,41 +94,38 @@ public class CwProjectReportArchiveDetailService extends ServiceImpl<CwProjectRe
             for (CwProjectReportArchiveDetailDTO info : records) {
                 //如果归档日期为空，则表示该报告还未归档
                 if(null == info.getAuditDate()){
-                    //如果归档日期差大于30天，表示超期未归档
-                    if(info.getArchiveDay()>=30){
+                    //如果归档日期差大于60天，表示超期未归档
+                    if(info.getArchiveDay()>60){
+                        // 超期天数
+                        Integer overdueDay = info.getArchiveDay() - 60;
                         info.setStatus("超期未归档");
-                        long n = (info.getArchiveDay()) / 30;
-                        long yu = (info.getArchiveDay()) % 30;
-                        if (yu>0){
-                            n+=1;
-                        }
+                        long n = (long) Math.ceil((double)(overdueDay) / 30);
                         String money = Long.toString(n * 200);
-                        info.setOverdueDay(String.valueOf(info.getArchiveDay()));
+                        info.setOverdueDay(String.valueOf(overdueDay));
                         info.setFineMoney(money);
                     }else{
-                        //如果归档日期差小于等于30天，表示暂时未归档
+                        //如果归档日期差小于等于60天，表示暂时未归档
                         info.setStatus("暂时未归档");
-                        info.setOverdueDay(String.valueOf(info.getArchiveDay()));
+                        info.setOverdueDay(String.valueOf(info.getArchiveDay() - 60));
                         info.setFineMoney("0");
                     }
                 } else {
                     //如果归档日期不为空，则表示该报告已归档
 
-                    //如果归档日期差大于30天，表示已超期归档
-                    if(info.getArchiveDay()>=30){
+                    //如果归档日期差大于60天，表示已超期归档
+                    if(info.getArchiveDay()>60){
+                        // 超期天数
+                        Integer overdueDay = info.getArchiveDay() - 60;
+
                         info.setStatus("已超期归档");
-                        long n = (info.getArchiveDay()) / 30;
-                        long yu = (info.getArchiveDay()) % 30;
-                        if (yu>0){
-                            n+=1;
-                        }
+                        long n = (long) Math.ceil((double)(overdueDay) / 30);
                         String money = Long.toString(n * 200);
-                        info.setOverdueDay(String.valueOf(info.getArchiveDay() ));
+                        info.setOverdueDay(String.valueOf(overdueDay));
                         info.setFineMoney(money);
                     }else{
-                        //如果归档日期差小于等于30天，表示已按时归档
+                        //如果归档日期差小于等于60天，表示已按时归档
                         info.setStatus("已按时归档");
-                        info.setOverdueDay(String.valueOf(info.getArchiveDay()));
+                        info.setOverdueDay(String.valueOf(info.getArchiveDay() - 60));
                         info.setFineMoney("0");
                     }
                 }

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectReportArchive/service/CwProjectReportArchiveService.java

@@ -222,41 +222,38 @@ public class CwProjectReportArchiveService extends ServiceImpl<CwProjectReportAr
             for (CwProjectReportArchiveDTO info : records) {
                 //如果归档日期为空，则表示该报告还未归档
                 if(null == info.getAuditDate()){
-                    //如果归档日期差大于30天，表示超期未归档
-                    if(info.getArchiveDay()>=30){
+                    //如果归档日期差大于60天，表示超期未归档
+                    if(info.getArchiveDay()>60){
+                        // 超期天数
+                        Integer overdueDay = info.getArchiveDay() - 60;
                         info.setArchiveSta("超期未归档");
-                        long n = (info.getArchiveDay()) / 30;
-                        long yu = (info.getArchiveDay()) % 30;
-                        if (yu>0){
-                            n+=1;
-                        }
+                        long n = (long) Math.ceil((double)(overdueDay) / 30);
                         String money = Long.toString(n * 200);
-                        info.setOverdueDay(String.valueOf(info.getArchiveDay() ));
+                        info.setOverdueDay(String.valueOf(overdueDay));
                         info.setFineMoney(money);
                     }else{
-                        //如果归档日期差小于等于30天，表示暂时未归档
+                        //如果归档日期差小于等于60天，表示暂时未归档
                         info.setArchiveSta("暂时未归档");
-                        info.setOverdueDay(String.valueOf(info.getArchiveDay() ));
+                        info.setOverdueDay(String.valueOf(info.getArchiveDay() - 60));
                         info.setFineMoney("0");
                     }
                 } else {
                     //如果归档日期不为空，则表示该报告已归档
 
-                    //如果归档日期差大于30天，表示已超期归档
-                    if(info.getArchiveDay()>=30){
+                    //如果归档日期差大于60天，表示已超期归档
+                    if(info.getArchiveDay()>60){
+                        // 超期天数
+                        Integer overdueDay = info.getArchiveDay() - 60;
+
                         info.setArchiveSta("已超期归档");
-                        long n = (info.getArchiveDay()) / 30;
-                        long yu = (info.getArchiveDay()) % 30;
-                        if (yu>0){
-                            n+=1;
-                        }
+                        long n = (long) Math.ceil((double)(overdueDay) / 30);
                         String money = Long.toString(n * 200);
-                        info.setOverdueDay(String.valueOf(info.getArchiveDay() ));
+                        info.setOverdueDay(String.valueOf(overdueDay));
                         info.setFineMoney(money);
                     }else{
-                        //如果归档日期差小于等于30天，表示已按时归档
+                        //如果归档日期差小于等于60天，表示已按时归档
                         info.setArchiveSta("已按时归档");
-                        info.setOverdueDay(String.valueOf(info.getArchiveDay() ));
+                        info.setOverdueDay(String.valueOf(info.getArchiveDay() - 60));
                         info.setFineMoney("0");
                     }
                 }

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/reimbursementApproval/approvalInfo/service/CwReimbursementInfoService.java

@@ -577,7 +577,7 @@ public class CwReimbursementInfoService {
         }*/
         // 修改附件信息列表
         if (CollectionUtils.isNotEmpty(dto.getFiles())) {
-            infoService.updateFiles(dto.getFiles(), userDTO, dto.getId());
+            infoService.updateFiles(dto.getFiles(), userDTO, dto.getId(),"cwWorkContract");
         }
         return info;
     }