1

science-admin/src/main/java/com/yiboshi/science/dao/ComUnitDAO.java

@@ -21,6 +21,7 @@ import java.util.List;
 public interface ComUnitDAO extends BaseMapper<ComUnit>, BaseDAO<ComUnitQueryVO, ComUnitDTO, ComUnit> {
     String getMaxTreeCode(String Code);
 
+
     ComUnitDTO getUnitById(String id);
 
     ComUnitDTO getTopUnit(int len);

science-admin/src/main/java/com/yiboshi/science/rest/v1/ComProjectAuditController.java

@@ -158,9 +158,11 @@ public class ComProjectAuditController extends BaseController<ComProjectAuditSer
                     if (Objects.nonNull(e.getTotalFunding())) {
                         total = e.getTotalFunding();
                     }
+
                     if (Objects.nonNull(e.getGovFunding())) {
                         gov = e.getGovFunding();
                     }
+
                     self = total.subtract(gov);
                     e.setSelfFunding(self);
                 }

science-admin/src/main/java/com/yiboshi/science/service/ComProjectAuditService.java

@@ -75,6 +75,7 @@ public interface ComProjectAuditService extends BaseService<ComProjectAuditQuery
      * @param auditUnitId
      * @param treeCode
      */
+
     void report(Integer reportYear, String reportObjectId, Integer auditType,Integer auditMethod, String auditUnitId,  String treeCode);
     /** 项目/任务书/中期考核审核
      *

science-admin/src/main/java/com/yiboshi/science/service/ComUnitService.java

@@ -17,6 +17,7 @@ import java.util.List;
  */
 public interface ComUnitService extends BaseService<ComUnitQueryVO, ComUnitDTO, ComUnit> {
 
+
     /** 获取最高级单位
      *
      * @return

science-admin/src/main/java/com/yiboshi/science/service/impl/ComProjectAuditServiceImpl.java

@@ -222,6 +222,7 @@ public class ComProjectAuditServiceImpl extends BaseServiceImpl<ComProjectAuditD
     }
 
     public void report(Integer reportYear, String auditObjectId, Integer auditType,Integer auditMethod, String auditUnitId, String treeCode) {
+
         if (null == auditMethod)
             auditMethod = CommonEnum.auditMethod.audit.getCode();
         int maxIndex = this.getMaxAuditIndex(auditObjectId);

science-admin/src/main/java/com/yiboshi/science/service/impl/ComProjectCheckServiceImpl.java

@@ -153,6 +153,7 @@ public class ComProjectCheckServiceImpl extends BaseServiceImpl<ComProjectCheckD
             throw new BusinessException("中期考核表不存在或已上报");
         ComProjectCheck comProjectCheck = convert2Entity(comProjectCheckDTO);
         comProjectResultsService.insertList(comProjectCheckDTO.getResults(), comProjectCheck.getId());
+
         comProjectAuditService.report(comProjectCheckDTO.getCheckYear(), comProjectCheckDTO.getId(), 3,null, unitId, treeCode);
         comProjectCheck.setCheckState(CommonEnum.checkState.review.getCode());
         return this.update(comProjectCheck);

science-admin/src/main/java/com/yiboshi/science/service/impl/ComProjectConclusionServiceImpl.java

@@ -193,6 +193,7 @@ public class ComProjectConclusionServiceImpl extends BaseServiceImpl<ComProjectC
         modal.setState(CommonEnum.conclusionState.report.getCode());
         modal.setThesisState(CommonEnum.thesisState.pass.getCode());
         comProjectService.updateStateOrNo(conclusion.getProjId(), CommonEnum.projState.report.getCode(), null, null);
+
         comProjectAuditService.report(DateUtils.getYear(), conclusion.getId(), 4,null, auditUnitId, treeCode);
         return this.update(modal);
     }

science-admin/src/main/java/com/yiboshi/science/service/impl/ComProjectServiceImpl.java

@@ -654,6 +654,7 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro
             unitId = unit.getId();
             treeCode = unit.getTreeCode();
         }
+
         comProjectAuditService.report(comProject.getReportYear(), model.getAuditObjectId(), model.getAuditType(), auditMethod, unitId, treeCode);
         String versionNo = "";
         if (null == comProject.getVersionNo())

science-admin/src/main/java/com/yiboshi/science/service/impl/ComUnitServiceImpl.java

@@ -115,6 +115,7 @@ public class ComUnitServiceImpl extends BaseServiceImpl<ComUnitDAO, ComUnitQuery
         return new Pagination<>(dtoList, page.getTotal(), vo.getPageSize());
     }
 
+
     public ComUnitDTO getTopUnit() {
         return comUnitDAO.getTopUnit(properties.getDefaultCodeLength());
     }

science-admin/src/main/java/com/yiboshi/science/utils/IDCardUtil.java

@@ -67,6 +67,7 @@ public class IDCardUtil {
                 String uyear = "19" + IDCard.substring(6, 8);
                 // 身份证上的月份
                 String uyue = IDCard.substring(8, 10);
+
                 // 当前年份
                 String fyear = format.format(date).substring(0, 4);
                 // 当前月份
@@ -81,6 +82,7 @@ public class IDCardUtil {
             } else if (IDCard.length() == EIGHTEEN_ID_CARD) {
                 // 身份证上的年份
                 String year = IDCard.substring(6).substring(0, 4);
+
                 // 身份证上的月份
                 String yue = IDCard.substring(10).substring(0, 2);
                 // 当前年份