1

science-admin/src/main/java/com/yiboshi/science/param/dto/ComProjectAuditDTO.java

@@ -157,6 +157,9 @@ public class ComProjectAuditDTO extends BaseDTO {
     /** 申报人身份证号 */
     @ApiModelProperty(value = "申报人身份证号", position = 41)
     private String certId;
+    /** 申报人年龄 */
+    @ApiModelProperty(value = "申报人年龄", position = 41)
+    private Integer age;
     /** 申报人id */
     @ApiModelProperty(value = "申报人id", position = 41)
     private String appPersonId;
@@ -225,8 +228,11 @@ public class ComProjectAuditDTO extends BaseDTO {
     @ApiModelProperty(value = "项目总经费(万元）", position = 39)
     private BigDecimal totalFunding;
     /** 申请科技经费(万元) */
-    @ApiModelProperty(value = "申请科技经费(万元)", position = 40)
+    @ApiModelProperty(value = "省级财政资金(万元)", position = 40)
     private BigDecimal govFunding;
+    /** 申请科技经费(万元) */
+    @ApiModelProperty(value = "自筹资金(万元)", position = 40)
+    private BigDecimal selfFunding;
     /** 项目分配信息 */
     List<ComProjectAssignDTO> assignList;
     /** 批量审核Id */

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

@@ -15,6 +15,7 @@ import com.yiboshi.science.rest.BaseController;
 import com.yiboshi.science.service.ComProjectAssignService;
 import com.yiboshi.science.service.ComProjectAuditService;
 import com.yiboshi.science.service.ComUnitService;
+import com.yiboshi.science.utils.IDCardUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -149,9 +150,11 @@ public class ComProjectAuditController extends BaseController<ComProjectAuditSer
                     e.setMobile(hideAllPhoneNum(e.getMobile()));
                 if (null != e.getAuditResult())
                     e.setAuditResultName(CommonEnum.auditResult.getEnum(e.getAuditResult()).getDescription());
-//                if(vo.getAuditMethod().equals(CommonEnum.auditMethod.last.getCode())){
-//                    e.setAssignList(comProjectAssignService.getAssignExpertList(e.getAuditObjectId()));
-//                }
+                if(vo.getAuditMethod().equals(CommonEnum.auditMethod.last.getCode())){
+//                  e.setAssignList(comProjectAssignService.getAssignExpertList(e.getAuditObjectId()));
+                    e.setAge(IDCardUtil.getAge(e.getCertId()));
+                    e.setSelfFunding(0);
+                }
             });
         }
         return ResponseDataModel.ok(page);

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

@@ -21,7 +21,7 @@
         SELECT
         a.*,c.id proj_id,c.proj_name,c.proj_no,c.version_no,c.app_no,c.proj_class,c.start_date,c.end_date,c.proj_state,c.knowledge_id,
         c.total_score,c.average_score,c.technology_score,c.technology_average_score,c.economy_score,c.economy_average_score,c.calculate_score,c.defense_score,
-        d.unit_name app_unit_name,e.person_name app_person_name,p.name as knowledgeName,p1.name as knowledgeParentName, f.total_funding, f.gov_funding,
+        d.unit_name app_unit_name,e.person_name app_person_name,e.cert_id,p.name as knowledgeName,p1.name as knowledgeParentName, f.total_funding, f.gov_funding,
         (case when g.unit_name = d.unit_name then '直属' else REPLACE(g.unit_name,'卫生健康局','') end) as upUnitName
         FROM com_project_audit a
         left join com_project c on a.audit_object_id=c.id