1

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

@@ -14,7 +14,7 @@ import java.util.List;
 
 /**
  * 审核表DTO
- * 
+ *
  * @author lkl
  * @version 2021-08-26
  */
@@ -118,6 +118,13 @@ public class ComProjectAuditDTO extends BaseDTO {
     private String knowledgeName;
     /** 学科Id */
     private String knowledgeCode;
+    /** 现从事专业 */
+    @ApiModelProperty(value = "现从事专业", position = 11 )
+    @Length(max=36, message = "现从事专业不能大于36")
+    private String profession;
+    /** 现从事专业 */
+    @ApiModelProperty(value = "现从事专业", position = 40)
+    private String professionName;
     /** 一级学科 */
     @ApiModelProperty(value = "学科", position = 16 )
     @Length(max=36, message = "学科")
@@ -215,7 +222,7 @@ public class ComProjectAuditDTO extends BaseDTO {
     @ApiModelProperty(value = "答辩总得分", position = 4)
     private BigDecimal defenseScore;
 
-    
+
     /** 评分 */
     @ApiModelProperty(value = "评分", position = 4)
     private String gradeScore;

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

@@ -130,17 +130,6 @@ public class ComProjectAuditController extends BaseController<ComProjectAuditSer
         return getPaginationResponseDataModel(vo);
     }
 
-    @ApiOperation(value = "1.03 分页查询", httpMethod = "GET", notes = "1.02 根据参数获取列表")
-    @GetMapping
-    @RequestMapping("/getFinalAuditListByPage")
-    @PreAuthorize("hasAnyRole('UNIT','GOV')")
-    public ResponseDataModel<Pagination<ComProjectAuditDTO>> getFinalAuditListByPage(@Validated ComProjectAuditQueryVO vo, BindingResult bindingResult) {
-        vo.setAuditUnitId(SecurityUserHolder.getUnitId());
-        vo.setAuditMethod(CommonEnum.auditMethod.last.getCode());
-        vo.setCompleted(1);
-        return getPaginationResponseDataModel(vo);
-    }
-
     private ResponseDataModel<Pagination<ComProjectAuditDTO>> getPaginationResponseDataModel(@Validated ComProjectAuditQueryVO vo) {
         Pagination<ComProjectAuditDTO> page = comProjectAuditService.getAuditListByPage(vo);
         if (null != page && null != page.getDataList() && page.getDataList().size() != 0) {
@@ -206,24 +195,9 @@ public class ComProjectAuditController extends BaseController<ComProjectAuditSer
     @PreAuthorize("hasAnyRole('UNIT','GOV')")
     public ResponseDataModel<DataStatisticsDTO> getTalentAuditCount(ComProjectAuditQueryVO vo) {
         vo.setAuditUnitId(SecurityUserHolder.getUnitId());
-        vo.setAuditMethod(CommonEnum.auditMethod.audit.getCode());
         return ResponseDataModel.ok(comProjectAuditService.getTalentAuditCount(vo));
     }
 
-    /**
-     * 获取统计数据
-     */
-    @ApiOperation(value = "获取统计数据", httpMethod = "GET", notes = "获取统计数据")
-    @GetMapping
-    @RequestMapping("/getFinalCount")
-    @PreAuthorize("hasAnyRole('UNIT','GOV')")
-    public ResponseDataModel<DataStatisticsDTO> getFinalCount(ComProjectAuditQueryVO vo) {
-        vo.setAuditUnitId(SecurityUserHolder.getUnitId());
-        vo.setAuditMethod(CommonEnum.auditMethod.last.getCode());
-        vo.setCompleted(1);
-        return ResponseDataModel.ok(comProjectAuditService.getCount(vo));
-    }
-
     /**
      * 功能:分页查询
      *

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

@@ -97,15 +97,15 @@
 
     <select id="getTalentAuditListByPage" resultType="com.yiboshi.science.param.dto.ComProjectAuditDTO">
         SELECT
-        a.*,c.id talent_id,b.cert_id, b.person_name, b.sex, b.mobile, b.duty, b.title, b.spec, i.name as title_name, j.name as spec_name,
+        a.*,c.id talent_id,e.cert_id, e.person_name, e.sex, e.mobile, e.duty, e.title, e.spec, i.name as title_name, j.name as profession_name,
         d.unit_name app_unit_name, (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_talent_apply c on a.audit_object_id = c.id
-        left join com_person b on c.person_id = b.id
+        left join com_person e on c.person_id = e.id
         left join com_unit d on c.app_unit_id = d.id
         left join com_unit g on substring(d.tree_code, 1, 10) = g.tree_code
-        left join system_parameter i on b.title = i.id and i.type_id = 7
-        left join system_parameter j on b.spec = j.id and j.type_id = 68
+        left join system_parameter i on e.title = i.id and i.type_id = 7
+        left join system_parameter j on e.profession = j.id and j.type_id = 69
         <where>
             ${ew.sqlSegment}
         </where>
@@ -118,7 +118,7 @@
         ifnull(sum(case when a.audit_result =20 then 1 else 0 end),0) count4,
         ifnull(sum(case when a.id is not null then 1 else 0 end),0) count5
         FROM com_project_audit a
-        left join com_talent_apply j on a.audit_object_id = j.id
+        left join com_talent_apply c on a.audit_object_id = c.id
         <where>
             ${ew.sqlSegment}
         </where>