同步代码

sgzb-common/sgzb-common-core/src/main/java/com/bonus/sgzb/common/core/constant/Constants.java

@@ -159,4 +159,7 @@ public class Constants
      */
     public static final String privateKey = "MIIBVAIBADANBgkqhkiG9w0BAQEFAASCAT4wggE6AgEAAkEAqhHyZfSsYourNxaY7Nt+PrgrxkiA50efORdI5U5lsW79MmFnusUA355oaSXcLhu5xxB38SMSyP2KvuKNPuH3owIDAQABAkAfoiLyL+Z4lf4Myxk6xUDgLaWGximj20CUf+5BKKnlrK+Ed8gAkM0HqoTt2UZwA5E2MzS4EI2gjfQhz5X28uqxAiEA3wNFxfrCZlSZHb0gn2zDpWowcSxQAgiCstxGUoOqlW8CIQDDOerGKH5OmCJ4Z21v+F25WaHYPxCFMvwxpcw99EcvDQIgIdhDTIqD2jfYjPTY8Jj3EDGPbH2HHuffvflECt3Ek60CIQCFRlCkHpi7hthhYhovyloRYsM+IS9h/0BzlEAuO0ktMQIgSPT3aFAgJYwKpqRYKlLDVcflZFCKY7u3UP8iWi1Qw0Y=";
 
+    public static final String INNER_PROTOCAL = "1"; //内部单位协议
+
+    public static final String OUTER_PROTOCAL = "2"; //外部单位协议
 }

sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/impl/LeaseOutDetailsServiceImpl.java

@@ -10,6 +10,7 @@ import com.bonus.sgzb.base.api.domain.*;
 import com.bonus.sgzb.base.mapper.MaLabelBindMapper;
 import com.bonus.sgzb.base.mapper.MaMachineMapper;
 import com.bonus.sgzb.base.vo.MaLabelBindVO;
+import com.bonus.sgzb.common.core.constant.Constants;
 import com.bonus.sgzb.common.core.utils.StringUtils;
 import com.bonus.sgzb.common.core.web.domain.AjaxResult;
 import com.bonus.sgzb.common.security.utils.SecurityUtils;
@@ -361,9 +362,9 @@ public class LeaseOutDetailsServiceImpl implements LeaseOutDetailsService {
             if (StringUtils.isEmpty(protocol)) {
                 ma.setFinalPrice(ma.getLeasePrice());
             } else {
-                if ("1".equals(protocol)) {
+                if (Constants.INNER_PROTOCAL.equals(protocol)) {
                     ma.setFinalPrice(ma.getLeasePrice());
-                } else if ("2".equals(protocol)) {
+                } else if (Constants.OUTER_PROTOCAL.equals(protocol)) {
                     ma.setFinalPrice(ma.getRentPrice());
                 } else {
                     ma.setFinalPrice(ma.getLeasePrice());

sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/SltAgreementInfoController.java

@@ -101,6 +101,7 @@ public class SltAgreementInfoController extends BaseController {
         List<SltAgreementInfo> sltInfoMonth = sltAgreementInfoService.getSltInfoMonth(list);
         List<List<MonthRepairInfo>> allLists = new ArrayList<>();
         for (AgreementInfo agreementInfo : list) {
+            List<MonthRepairInfo> list1 = new ArrayList<>();
             for (SltAgreementInfo sltAgreementInfo : sltInfoMonth) {
                 // 单个协议导出
                 if (StringUtils.isNotBlank(agreementInfo.getCodeNum())) {
@@ -109,16 +110,19 @@ public class SltAgreementInfoController extends BaseController {
                         if (s.equals(sltAgreementInfo.getCodeNum().toString())) {
                             List<SltAgreementInfo> node = sltAgreementInfo.getNode();
                             List<MonthRepairInfo> leaseInfoList = Convert.toList(MonthRepairInfo.class, node);
-                            allLists.add(leaseInfoList);
+                            list1.addAll(leaseInfoList);
                         }
                     }
                 } else {
-                    // 多个协议导出
+                    if (String.valueOf(agreementInfo.getAgreementId()).equals(sltAgreementInfo.getAgreementId())){
-                    List<SltAgreementInfo> node = sltAgreementInfo.getNode();
+                        // 多个协议导出
-                    List<MonthRepairInfo> leaseInfoList = Convert.toList(MonthRepairInfo.class, node);
+                        List<SltAgreementInfo> node = sltAgreementInfo.getNode();
-                    allLists.add(leaseInfoList);
+                        List<MonthRepairInfo> leaseInfoList = Convert.toList(MonthRepairInfo.class, node);
+                        list1.addAll(leaseInfoList);
+                    }
                 }
             }
+            allLists.add(list1);
         }
         exportMultipleLists(allLists, response);
     }
@@ -283,7 +287,7 @@ public class SltAgreementInfoController extends BaseController {
             ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream(), MonthRepairInfo.class).build();
 
             for (int i = 0; i < lists.size(); i++) {
-                WriteSheet writeSheet = EasyExcel.writerSheet("Sheet" + (i + 1)).build();
+                WriteSheet writeSheet = EasyExcel.writerSheet(lists.get(i).get(0).getProjectName()).build();
                 excelWriter.write(lists.get(i), writeSheet);
             }
 

sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/BackApplyMapper.java

@@ -118,8 +118,6 @@ public interface BackApplyMapper {
      * @param bean
      * @return
      */
-    List<TypeTreeNode> getUseTypeTree(BackApplyInfo bean);
-
     List<TypeTreeNode> getUseTypeTreeL4(BackApplyInfo bean);
 
     List<TypeTreeNode> getUseTypeTreeL3(List<Long> list);

sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/BackApplyServiceImpl.java

@@ -369,11 +369,13 @@ public class BackApplyServiceImpl implements BackApplyService {
         List<TypeTreeNode> listL3 = new ArrayList<>();
         List<TypeTreeNode> listL21 = new ArrayList<>();
         try {
-            //list = backApplyMapper.getUseTypeTree(bean);
+            // 先查第四层类型
             listL4 = backApplyMapper.getUseTypeTreeL4(bean);
             List<Long> list4ParentIds = listL4.stream().map(o -> o.getParentId()).collect(Collectors.toList());
+            // 根据第四层parentId 查第三层类型
             listL3 = backApplyMapper.getUseTypeTreeL3(list4ParentIds);
             List<Long> list3ParentIds = listL3.stream().map(o -> o.getParentId()).collect(Collectors.toList());
+            // 根据第三层parentId 查第1.2层类型
             listL21 = backApplyMapper.getUseTypeTreeL21(list3ParentIds);
             list.addAll(listL4);
             list.addAll(listL3);

sgzb-modules/sgzb-material/src/main/resources/mapper/material/AgreementInfoMapper.xml

@@ -61,7 +61,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="authPerson != null">#{authPerson},</if>
             <if test="phone != null">#{phone},</if>
             <if test="updateBy != null">#{updateBy},</if>
-            <if test="protocol != null">#{protocol},</if>
+            1,
             NOW(),
             <if test="remark != null">#{remark},</if>
             <if test="companyId != null">#{companyId},</if>

sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackApplyMapper.xml

@@ -610,106 +610,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <!--            LEVEL ASC;-->
 <!--    </select>-->
 
-    <select id="getUseTypeTree" resultType="com.bonus.sgzb.material.domain.TypeTreeNode">
-        -- 查询从第四级到第一级的所有类型及相关信息
-        SELECT
-            t4.type_id,
-            t4.type_name,
-            t4.parent_id,
-            t4.unit_name,
-            t4.company_id,
-            COALESCE(SUM(CASE WHEN sai.agreement_id = #{agreementId} AND sai.status = '0' THEN sai.num ELSE 0 END), 0) AS num,
-            4 AS LEVEL
-        FROM
-            ma_type t4
-                LEFT JOIN slt_agreement_info sai ON t4.type_id = sai.type_id
-        WHERE
-            t4.level = 4
-          AND EXISTS (
-            SELECT 1 FROM slt_agreement_info sai2
-            WHERE sai2.type_id = t4.type_id AND sai2.agreement_id = #{agreementId} AND sai2.status = '0'
-        )
-        GROUP BY
-            t4.type_id
-
-        UNION ALL
-
-        SELECT
-            t3.type_id,
-            t3.type_name,
-            t3.parent_id,
-            t3.unit_name,
-            t3.company_id,
-            0 AS num,
-            3 AS LEVEL
-        FROM
-            ma_type t3
-                INNER JOIN (
-                SELECT DISTINCT t4.parent_id
-                FROM ma_type t4
-                WHERE t4.level = 4
-            ) AS parent_t4 ON t3.type_id = parent_t4.parent_id
-
-        UNION ALL
-
-        SELECT
-            t2.type_id,
-            t2.type_name,
-            t2.parent_id,
-            t2.unit_name,
-            t2.company_id,
-            0 AS num,
-            2 AS LEVEL
-        FROM
-            ma_type t2
-                INNER JOIN (
-                SELECT DISTINCT t3.parent_id
-                FROM ma_type t3
-                WHERE t3.level = 3
-            ) AS parent_t3 ON t2.type_id = parent_t3.parent_id
-
-        UNION ALL
-
-        SELECT
-            t1.type_id,
-            t1.type_name,
-            t1.parent_id,
-            t1.unit_name,
-            t1.company_id,
-            0 AS num,
-            1 AS LEVEL
-        FROM
-            ma_type t1
-                INNER JOIN (
-                SELECT DISTINCT t2.parent_id
-                FROM ma_type t2
-                WHERE t2.level = 2
-            ) AS parent_t2 ON t1.type_id = parent_t2.parent_id
-
-        ORDER BY
-            LEVEL ASC, type_id;
-    </select>
-
     <select id="getUseTypeTreeL4" resultType="com.bonus.sgzb.material.domain.TypeTreeNode">
         SELECT
-            t4.type_id,
+            mt.type_id,
-            t4.type_name,
+            mt.type_name,
-            t4.parent_id,
+            mt.parent_id,
-            t4.unit_name,
+            mt.unit_name as unitNames,
-            t4.company_id,
+            mt.company_id,
-            COALESCE(SUM(CASE WHEN sai.agreement_id = #{agreementId} AND sai.status = '0' THEN sai.num ELSE 0 END), 0) AS num,
+            SUM( CASE WHEN sai.agreement_id = #{agreementId} AND sai.STATUS = '0' THEN sai.num ELSE 0 END ) AS num,
-            4 AS LEVEL
+            mt.LEVEL
         FROM
-            ma_type t4
+            ma_type mt
-                LEFT JOIN slt_agreement_info sai ON t4.type_id = sai.type_id
+                LEFT JOIN slt_agreement_info sai ON mt.type_id = sai.type_id
         WHERE
-            t4.level = 4
+            EXISTS ( SELECT 1 FROM slt_agreement_info sai2 WHERE sai2.type_id = mt.type_id AND sai2.agreement_id = #{agreementId} AND sai2.STATUS = '0' and sai.lease_type = 0)
-          AND EXISTS (
-            SELECT 1 FROM slt_agreement_info sai2
-            WHERE sai2.type_id = t4.type_id AND sai2.agreement_id = #{agreementId} AND sai2.status = '0'
-        )
         GROUP BY
-            t4.type_id
+            mt.type_id
     </select>
 
     <select id="getUseTypeTreeL3" resultType="com.bonus.sgzb.material.domain.TypeTreeNode">

sgzb-modules/sgzb-material/src/main/resources/mapper/material/CalMonthlyMapper.xml

@@ -32,6 +32,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             bui.unit_name AS unitName,
             bp.lot_name AS projectName,
             spm.month as month,
+            pmc.agreement_id as agreementId,
             pmc.cost_bearing_party as costBearingParty,
             pmc.costs as costs
         FROM