Pārlūkot izejas kodu

台账管理-业内台账
1、添加日期是否填写
2、排除query表废除的记录
3、文件提名查询
4、文件pdf查询

LHB 1 mēnesi atpakaļ
vecāks
revīzija
5d6a6011e4

+ 13 - 0
blade-service-api/blade-business-api/src/main/java/org/springblade/business/vo/NeiYeLedgerVO.java

@@ -85,6 +85,19 @@ public class NeiYeLedgerVO {
      */
     @ApiModelProperty(value = "information-query主键")
     private String id;
+    /**
+     * 是否填写了日期
+     */
+    private Integer dateIsComplete;
+    /**
+     * 文件提名
+     */
+    private String infoQueryName;
+
+    /**
+     * 文件pdf路径
+     */
+    private String pdfUrl;
 
     public NeiYeLedgerVO(String... values) {
         this.unitProject = values[0];

+ 14 - 0
blade-service-api/blade-business-api/src/main/java/org/springblade/business/vo/QueryProcessDataVO.java

@@ -33,4 +33,18 @@ public class QueryProcessDataVO {
 
     private String isExperiment;
 
+    /**
+     * 是否填写了日期
+     */
+    private Integer dateIsComplete;
+    /**
+     * 文件提名
+     */
+    private String infoQueryName;
+
+    /**
+     * 文件pdf路径
+     */
+    private String pdfUrl;
+
 }

+ 7 - 3
blade-service/blade-business/src/main/java/org/springblade/business/controller/NeiYeController.java

@@ -273,7 +273,7 @@ public class NeiYeController {
                     }
                     //todo 当前缺少是否关联评定、是否关联试验 =================================
                     //新增列表数据
-                    neiYeLedgerVOList.add(new NeiYeLedgerVO(map.get("unitProject"),
+                    NeiYeLedgerVO neiYeLedgerVO = new NeiYeLedgerVO(map.get("unitProject"),
                             map.get("partProject"),
                             map.get("partChildProject"),
                             map.get("subentryProject"),
@@ -285,8 +285,12 @@ public class NeiYeController {
                             vo.getEvaluate(),
                             vo.getIsExperiment(),
                             vo.getReportNumber(),
-                            vo.getInformationQueryId())
-                    );
+                            vo.getInformationQueryId());
+
+                    neiYeLedgerVO.setDateIsComplete(vo.getDateIsComplete());
+                    neiYeLedgerVO.setInfoQueryName(vo.getInfoQueryName());
+                    neiYeLedgerVO.setPdfUrl(vo.getPdfUrl());
+                    neiYeLedgerVOList.add(neiYeLedgerVO);
                 }
                 //转换为page信息
                 Query query = new Query();

+ 13 - 21
blade-service/blade-business/src/main/java/org/springblade/business/mapper/InformationQueryMapper.xml

@@ -50,6 +50,9 @@
         <result column="evaluate" property="evaluate"/>
         <result column="queryType" property="queryType"/>
         <result column="isExperiment" property="isExperiment"/>
+        <result column="dateIsComplete" property="dateIsComplete"/>
+        <result column="infoQueryName" property="infoQueryName"/>
+        <result column="pdfUrl" property="pdfUrl"/>
     </resultMap>
 
     <resultMap id="queryContractTreeMap" type="org.springblade.manager.vo.WbsTreeContractTreeVOS">
@@ -428,9 +431,12 @@
                wtc.p_key_id,
                wtc.ancestors,
                wtc.major_data_type,
+               wtc.date_is_complete AS dateIsComplete,
                IFNULL(if(length(trim(wtc.full_name)) > 0, wtc.full_name, wtc.node_name), wtc.node_name) AS     title,
                wtc.parent_id                                                                            AS     parentId,
                uiq.id                                                                                   AS     informationQueryId,
+               uiq.name                                                                                   AS     infoQueryName,
+               uiq.pdf_url                                                                                   AS     pdfUrl,
                uiq.status,
                (
                    select case iq.status
@@ -450,26 +456,10 @@
         AS isExperiment
         FROM
         m_wbs_tree_contract AS wtc
-        LEFT JOIN u_information_query AS uiq ON wtc.p_key_id = uiq.wbs_id AND uiq.classify =
-        #{classify}
-        and
-        uiq
-        .
-        is_deleted
-        =
-        0
+        LEFT JOIN u_information_query AS uiq ON wtc.p_key_id = uiq.wbs_id AND uiq.classify = #{classify} and uiq.is_deleted =  0 and uiq.status != 3
         WHERE
-        wtc
-        .
-        p_key_id
-        =
-        #{primaryKeyId}
-        AND
-        wtc
-        .
-        is_deleted
-        =
-        0
+        wtc.p_key_id = #{primaryKeyId}
+        AND  wtc.is_deleted = 0
     </select>
 
     <select id="queryProcessDataByParentIdAndContractId" resultMap="queryProcessDataMap">
@@ -822,6 +812,7 @@
     </select>
     <select id="queryProcessDataByParentIdAndContractIdTwo" resultMap="queryProcessDataMap">
         SELECT wtc.id                                                                                   AS treeId,
+               wtc.date_is_complete                                                                     AS dateIsComplete,
                wtc.p_key_id,
                wtc.ancestors,
                wtc.major_data_type,
@@ -831,14 +822,15 @@
                uiq.id                                                                                   AS informationQueryId,
                IFNULL(uiq.status, 0)                                                                    AS status,
                uiq.type                                                                                 AS queryType,
+               uiq.name                                                                                 AS infoQueryName,
+               uiq.pdf_url                                                                              AS pdfUrl,
                case
                    WHEN uiq.pdf_trial_url is null then 'false'
                    ELSE 'true' end                                                                      AS isExperiment
         FROM m_wbs_tree_contract AS wtc
                  LEFT JOIN u_information_query AS uiq
                            ON wtc.p_key_id = uiq.wbs_id AND uiq.classify = #{classify} and uiq.is_deleted = 0 and
-                              wtc.is_deleted = 0 and
-                              wtc.status = 1
+                              uiq.status != 3
         WHERE wtc.type = 1
           AND wtc.major_data_type in (0, 1, 2, 3, 4)
           AND wtc.ancestors like concat('%', #{parentId}, '%')