Merge remote-tracking branch 'origin/master'

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

@@ -102,6 +102,8 @@ public class ComProjectAuditDTO extends BaseDTO {
     @ApiModelProperty(value = "学科", position = 16 )
     @Length(max=36, message = "学科")
     private String knowledgeName;
+    /** 学科Id */
+    private String knowledgeCode;
     /** 一级学科 */
     @ApiModelProperty(value = "学科", position = 16 )
     @Length(max=36, message = "学科")

science-admin/src/main/java/com/yiboshi/science/param/query/ComProjectAuditQueryVO.java

@@ -67,6 +67,9 @@ public class ComProjectAuditQueryVO extends PaginationVO{
     /** 项目编号 */
     @ApiModelProperty(value = "项目编号", position = 2)
     private String projNo;
+    /** 申请编号 */
+    @ApiModelProperty(value = "申请编号", position = 2)
+    private String appNo;
     /** 项目类别 */
     @ApiModelProperty(value = "项目类别", position = 3)
     private String projClass;
@@ -80,6 +83,8 @@ public class ComProjectAuditQueryVO extends PaginationVO{
     @ApiModelProperty(value = "学科Id", position = 16 )
     @Length(max=36, message = "学科Id不能大于36")
     private String knowledgeId;
+    /** 学科Id */
+    private String knowledgeCode;
     /** 项目状态 -10 起草,10 待提交, 20 已提交至依托单位,25 依托单位审核通过，请打印申请书,30 返回修改,40 未批准立项,50 批准立项 */
     @ApiModelProperty(value = "项目状态 -10 起草,10 待提交, 20 已提交至依托单位,25 依托单位审核通过，请打印申请书,30 返回修改,40 未批准立项,50 批准立项", position = 7)
     private Integer projState;

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

@@ -72,6 +72,9 @@ public class ComProjectAuditServiceImpl extends BaseServiceImpl<ComProjectAuditD
         if (Objects.nonNull(vo.getProjName())) {
             criteria.like("proj_name", vo.getProjName());
         }
+        if (Objects.nonNull(vo.getAppNo())) {
+            criteria.like("app_no", vo.getAppNo());
+        }
         if (Objects.nonNull(vo.getProjNo())) {
             criteria.like("proj_no", vo.getProjNo());
         }
@@ -96,6 +99,10 @@ public class ComProjectAuditServiceImpl extends BaseServiceImpl<ComProjectAuditD
         if (Objects.nonNull(vo.getKnowledgeParentId())) {
             criteria.eq("p1.id", vo.getKnowledgeParentId());
         }
+        if (Objects.nonNull(vo.getKnowledgeCode())) {
+            //and (p.id = #{knowledgeCode} or p1.id = #{knowledgeCode} or p2.id = #{knowledgeCode})
+            criteria.and(qw -> qw.eq("p.id", vo.getKnowledgeCode()).or().eq("p1.id", vo.getKnowledgeCode()).or().eq("p2.id", vo.getKnowledgeCode()));
+        }
         if (Objects.nonNull(vo.getCompleted())) {
             criteria.eq("c.completed", vo.getCompleted());
         }

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

@@ -723,7 +723,7 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro
     public String projectInsert(ComProjectDTO dto) {
         ComBatchDTO comBatchDTO = comBatchService.getCurrentYearBatchByType(dto.getProjType());
         ComProject comProject = convert2Entity(dto);
-        comProject.setProjNo(getProjectNo(comBatchDTO.getYear(), "NMWJKJXM"));
+        //comProject.setProjNo(getProjectNo(comBatchDTO.getYear(), "NMWJKJXM"));
 //        if (null != comProject.getKnowledgeId())
 //            comProject.setProjNo(getProjectNo(comBatchDTO.getYear(), systemParameterService.getParameterById(comProject.getKnowledgeId()).getGbCode()));
         comProject.setAppNo(getAppNo());

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

@@ -246,6 +246,7 @@
         left join com_person e on c.app_person_id=e.id
         left join system_parameter p on c.knowledge_id = p.id
         left join system_parameter p1 on p.parent_id = p1.id
+        left join system_parameter p2 on p1.parent_id = p2.id
         <where>
             ${ew.sqlSegment}
         </where>

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

@@ -13,7 +13,7 @@
     </sql>
     <select id="getListByPage" resultType="com.yiboshi.science.param.dto.ComProjectDTO">
         SELECT
-        c.id,c.report_year,c.proj_name,c.proj_no,c.version_no,c.proj_class,c.start_date,c.end_date,c.proj_state,d.unit_name
+        c.id,c.report_year,c.proj_name,c.app_no,c.proj_no,c.version_no,c.proj_class,c.start_date,c.end_date,c.proj_state,d.unit_name
         app_unit_name,e.person_name app_person_name,f.name knowledge_name
         from com_project c
         left join com_unit d on c.app_unit_id=d.id