1

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

@@ -137,18 +137,9 @@ public class ComProjectAuditController extends BaseController<ComProjectAuditSer
         Pagination<ComProjectAuditDTO> page = comProjectAuditService.getAuditListByPage(vo);
         if (null != page && null != page.getDataList() && page.getDataList().size() != 0) {
             page.getDataList().forEach((e) -> {
-                if (vo.getPageIndex() != -1) {
-                    e.setMobile(hideAllPhoneNum(e.getMobile()));
-                    e.setCertId(hideAllIdCardNum(e.getCertId()));
-                }
-                if (null != e.getAuditResult())
-                    e.setAuditResultName(CommonEnum.auditResult.getEnum(e.getAuditResult()).getDescription());
-                e.setTalentCategoryName(systemParameterService.getParaName(e.getTalentCategory()));
-                e.setTitleName(systemParameterService.getParaName(e.getTitle()));
-                e.setProfessionName(systemParameterService.getParaName(e.getProfession()));
-                if (vo.getAuditMethod().equals(CommonEnum.auditMethod.last.getCode()) && vo.getAuditType().equals(CommonEnum.auditType.project.getCode())) {
-//                  e.setAssignList(comProjectAssignService.getAssignExpertList(e.getAuditObjectId()));
-                    e.setAge(IDCardUtil.getAge(e.getCertId()));
+                if ((vo.getAuditMethod().equals(CommonEnum.auditMethod.last.getCode())
+                        && vo.getAuditType().equals(CommonEnum.auditType.project.getCode()))
+                        || vo.getAuditType().equals(CommonEnum.auditType.task.getCode())) {
                     BigDecimal total = new BigDecimal(0);
                     BigDecimal gov = new BigDecimal(0);
                     BigDecimal self = new BigDecimal(0);
@@ -160,7 +151,19 @@ public class ComProjectAuditController extends BaseController<ComProjectAuditSer
                     }
                     self = total.subtract(gov);
                     e.setSelfFunding(self);
+                    e.setAge(IDCardUtil.getAge(e.getCertId()));
                 }
+                if (vo.getAuditType().equals(CommonEnum.auditType.talent.getCode())) {
+                    e.setTalentCategoryName(systemParameterService.getParaName(e.getTalentCategory()));
+                    e.setTitleName(systemParameterService.getParaName(e.getTitle()));
+                    e.setProfessionName(systemParameterService.getParaName(e.getProfession()));
+                }
+                if (vo.getPageIndex() != -1) {
+                    e.setMobile(hideAllPhoneNum(e.getMobile()));
+                    e.setCertId(hideAllIdCardNum(e.getCertId()));
+                }
+                if (null != e.getAuditResult())
+                    e.setAuditResultName(CommonEnum.auditResult.getEnum(e.getAuditResult()).getDescription());
             });
         }
         return ResponseDataModel.ok(page);

science-admin/src/main/resources/mapper/ComProjectAuditDAO.xml

@@ -41,10 +41,14 @@
     </select>
     <select id="getTaskAuditListByPage"  resultType="com.yiboshi.science.param.dto.ComProjectAuditDTO">
         SELECT
-        a.*,c.id proj_id,c.proj_name,c.proj_no,c.version_no,c.app_no,c.proj_class,b.start_date,b.end_date,c.proj_state,d.unit_name app_unit_name,e.person_name app_person_name
+        a.*,c.id proj_id,c.proj_name,c.proj_no,c.version_no,c.app_no,c.proj_class,b.start_date,b.end_date,
+        c.proj_state,
+        d.unit_name app_unit_name,e.person_name app_person_name,
+        f.total_funding, f.gov_funding
         FROM com_project_audit a
         left join com_project_task b on a.audit_object_id=b.id
         left join com_project c on b.proj_id=c.id
+        left join com_project_basic f on c.id = f.proj_id
         left join com_unit d on c.app_unit_id=d.id
         left join com_person e on c.app_person_id=e.id
         <where>