27523 【户用光伏】发起合同允许两个人管理员盖章

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/QiyuesuoController.java

@@ -15,6 +15,7 @@ import com.qiyuesuo.sdk.v2.response.MiniappTicketResult;
 import com.qiyuesuo.sdk.v2.response.SdkResponse;
 import com.qiyuesuo.sdk.v2.utils.Algorithm;
 import com.qiyuesuo.sdk.v2.utils.Base64Utils;
+import com.qiyuesuo.sdk.v2.utils.CollectionUtils;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.module.hygf.api.Enum.ArrivalStateeEnum;
 import com.yeejoin.amos.boot.module.hygf.api.Enum.HouseholdContractEnum;
@@ -109,8 +110,10 @@ public class QiyuesuoController extends BaseController {
 			@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
 		QueryWrapper<SealDictionary> queryWrapper = new QueryWrapper();
 		queryWrapper.eq("amos_company_seq", sequenceNbr);
-		SealDictionary sealDictionary = sealDictionaryMapper.selectOne(queryWrapper);
-		request.setUser(new User(sealDictionary.getSealedPhone(), "MOBILE"));
+		List<SealDictionary> sealDictionaryList = sealDictionaryMapper.selectList(queryWrapper);
+		if(CollectionUtils.isNotEmpty(sealDictionaryList)){
+			request.setUser(new User(sealDictionaryList.get(0).getSealedPhone(), "MOBILE"));
+		}
 		SdkResponse<MiniappTicketResult> result = qiyuesuoService.getContractSdkResponse(request);
 		return ResponseHelper.buildResponse(result.getResult());
 	}

amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/resources/mapper/warning/McbWarningMapper.xml

@@ -6,11 +6,11 @@
         SELECT
             COUNT(*) as count
         FROM
-            amos_mcb.mcb_warning_warning_info log
-                LEFT JOIN amos_mcb.mcb_warning_base_source_attribution source ON source.CODE = log.SOURCE_ATTRIBUTION
+            mcb_warning_warning_info log
+                LEFT JOIN mcb_warning_base_source_attribution source1 ON source1.CODE = log.SOURCE_ATTRIBUTION
         <where>
             date(log.CREATE_DATE) = CURRENT_DATE
-            and  WARNING_SOURCE_TYPE_CODE in (SELECT code FROM amos_mcb.mcb_data_dictionary WHERE remark = 'OVERVIEW' )
+            and  WARNING_SOURCE_TYPE_CODE in (SELECT code FROM mcb_data_dictionary WHERE remark = 'OVERVIEW' )
             <if test="projectOrgCodes != null and projectOrgCodes.size() > 0">
                 AND SOURCE_ATTRIBUTION IN
                 <foreach collection="projectOrgCodes" item="item" open="(" separator="," close=")">
@@ -91,9 +91,9 @@
         IFNULL( count( log.SEQUENCE_NBR ), 0 ) AS seriesData,
         date( log.CREATE_DATE ) AS axisData
         FROM
-        amos_mcb.mcb_warning_warning_info log
+        mcb_warning_warning_info log
         WHERE
-        log.WARNING_SOURCE_TYPE_CODE IN ( SELECT CODE FROM amos_mcb.mcb_data_dictionary WHERE remark = 'OVERVIEW' )
+        log.WARNING_SOURCE_TYPE_CODE IN ( SELECT CODE FROM mcb_data_dictionary WHERE remark = 'OVERVIEW' )
         AND date( log.CREATE_DATE ) >= CURDATE( ) - INTERVAL 7 DAY
         <if test="projectOrgCodes != null and projectOrgCodes.size() > 0">
             AND log.SOURCE_ATTRIBUTION IN
@@ -108,23 +108,23 @@
     <select id="queryWarningList" resultType="java.util.Map">
         SELECT
         log.SEQUENCE_NBR,
-            DATE_FORMAT(log.CREATE_DATE, '%Y-%m-%d %H:%i:%s') AS CREATE_DATE,
-            DATE_FORMAT(log.REC_DATE, '%Y-%m-%d %H:%i:%s') AS REC_DATE,
+        log.CREATE_DATE AS CREATE_DATE,
+        log.REC_DATE AS REC_DATE,
         log.EVENT_LEVEL_DESC,
         log.EVENT_LEVEL,
         log.SOURCE_ATTRIBUTION_DESC,
         log.SOURCE_ATTRIBUTION,
         log.CONTENT,
-            LEVEL.COLOR,
-            source.PROVINCE,
+        warnLevel.COLOR,
+        source1.PROVINCE,
         log.WARNING_SOURCE_TYPE,
         log.OBJECT_NAME,
         log.PROCESSING_STATUS,
         log.PROCESSING_STATUS_DESC
         FROM
-            amos_mcb.mcb_warning_warning_info log
-                LEFT JOIN amos_mcb.mcb_warning_base_warning_level LEVEL ON log.EVENT_LEVEL = LEVEL.CODE and LEVEL.SEQUENCE_NBR in (1, 2, 3)
-	            LEFT JOIN amos_mcb.mcb_warning_base_source_attribution source ON source.CODE = log.SOURCE_ATTRIBUTION
+        mcb_warning_warning_info log
+        LEFT JOIN mcb_warning_base_warning_level warnLevel ON log.EVENT_LEVEL = warnLevel.CODE and warnLevel.SEQUENCE_NBR in (1, 2, 3)
+        LEFT JOIN mcb_warning_base_source_attribution source1 ON source1.CODE = log.SOURCE_ATTRIBUTION
         <where>
             <if test="projectOrgCodes != null and projectOrgCodes.size() > 0">
                 AND log.SOURCE_ATTRIBUTION IN
@@ -165,11 +165,11 @@
 
     <select id="queryWarningCount" resultType="java.lang.Long">
         SELECT
-            count(*)
+        COUNT(1)
         FROM
-            amos_mcb.mcb_warning_warning_info log
-                LEFT JOIN amos_mcb.mcb_warning_base_warning_level LEVEL ON log.EVENT_LEVEL = LEVEL.CODE and LEVEL.SEQUENCE_NBR in (1, 2, 3)
-                LEFT JOIN amos_mcb.mcb_warning_base_source_attribution source ON source.CODE = log.SOURCE_ATTRIBUTION
+        mcb_warning_warning_info log
+        LEFT JOIN mcb_warning_base_warning_level warnLevel ON log.EVENT_LEVEL = warnLevel.CODE and warnLevel.SEQUENCE_NBR in (1, 2, 3)
+        LEFT JOIN mcb_warning_base_source_attribution source1 ON source1.CODE = log.SOURCE_ATTRIBUTION
         <where>
             <if test="projectOrgCodes != null and projectOrgCodes.size() > 0">
                 AND log.SOURCE_ATTRIBUTION IN
@@ -270,18 +270,18 @@
             question.SOURCE_ATTRIBUTION,
             question.CONTENT,
             question.LEVEL_DESC,
-            source.PROVINCE
+            source1.PROVINCE
         FROM
         (SELECT
         QUESTION_NUM
         FROM
-        amos_mcb.mcb_warning_warning_info
+        mcb_warning_warning_info
         WHERE
         mcb_warning_warning_info.PROCESSING_STATUS = 2
         AND QUESTION_NUM IS NOT NULL
-        AND mcb_warning_warning_info.WARNING_SOURCE_TYPE_CODE IN ( SELECT CODE FROM amos_mcb.mcb_data_dictionary WHERE remark = 'OVERVIEW' )
-        ) warnNum LEFT  join   amos_mcb.mcb_warning_question_info question on question.NUM = warnNum.QUESTION_NUM
-        LEFT JOIN amos_mcb.mcb_warning_base_source_attribution source ON source.CODE = question.SOURCE_ATTRIBUTION
+        AND mcb_warning_warning_info.WARNING_SOURCE_TYPE_CODE IN ( SELECT CODE FROM mcb_data_dictionary WHERE remark = 'OVERVIEW' )
+        ) warnNum LEFT  join   mcb_warning_question_info question on question.NUM = warnNum.QUESTION_NUM
+        LEFT JOIN mcb_warning_base_source_attribution source1 ON source1.CODE = question.SOURCE_ATTRIBUTION
         <where>
             question.COMPLETION_STATUS != 1
             <if test="projectOrgCodes != null and projectOrgCodes.size() > 0">
@@ -324,7 +324,7 @@
         <if test="completionStatus != null and completionStatus != 0">
             AND question.COMPLETION_STATUS = #{completionStatus}
         </if>
-        LEFT JOIN mcb_warning_base_source_attribution source ON source.CODE = question.SOURCE_ATTRIBUTION
+        LEFT JOIN mcb_warning_base_source_attribution source1 ON source1.CODE = question.SOURCE_ATTRIBUTION
         <where>
             <if test="projectOrgCodes != null and projectOrgCodes.size() > 0">
                 AND question.SOURCE_ATTRIBUTION IN
@@ -351,9 +351,9 @@
                     SUM(IFNULL(RPN, 0)) AS totalRPN,
                     COUNT(SEQUENCE_NBR) AS todayAlarm
                 FROM
-                    amos_mcb.mcb_warning_warning_info
+                    mcb_warning_warning_info
                 WHERE
-            date(CREATE_DATE) = CURRENT_DATE and mcb_warning_warning_info.WARNING_SOURCE_TYPE_CODE in (select code FROM amos_mcb.mcb_data_dictionary WHERE remark = 'OVERVIEW')
+            date(CREATE_DATE) = CURRENT_DATE and mcb_warning_warning_info.WARNING_SOURCE_TYPE_CODE in (select code FROM mcb_data_dictionary WHERE remark = 'OVERVIEW')
         GROUP BY
             SOURCE_ATTRIBUTION
             )
@@ -370,11 +370,11 @@
             COALESCE(sq.totalRPN / NULLIF(COUNT(b.SOURCE_ATTRIBUTION), 0), 0) AS rpn,
             IFNULL(sq.todayAlarm,0) as todayAlarm
         FROM
-            amos_mcb.mcb_warning_base_source_attribution a
+            mcb_warning_base_source_attribution a
                 LEFT JOIN
             SubQuery sq ON a.CODE = sq.SOURCE_ATTRIBUTION
                 LEFT JOIN
-            amos_mcb.mcb_warning_warning_info b ON a.CODE = b.SOURCE_ATTRIBUTION AND date(b.CREATE_DATE) = CURRENT_DATE
+            mcb_warning_warning_info b ON a.CODE = b.SOURCE_ATTRIBUTION AND date(b.CREATE_DATE) = CURRENT_DATE
         <where>
             <if test="sourceAttribution != null and sourceAttribution != ''">
                 a.CODE LIKE CONCAT(#{sourceAttribution}, '%')
@@ -390,7 +390,7 @@
         SELECT
             count( 1 ) AS yearNum
         FROM
-            amos_mcb.mcb_warning_warning_info
+            mcb_warning_warning_info
                 Left join mcb_warning_base_source_attribution mwbsa  on mwbsa.CODE = mcb_warning_warning_info.SOURCE_ATTRIBUTION
         WHERE
             YEAR(CREATE_DATE) = YEAR(CURDATE())
@@ -400,14 +400,14 @@
         <if test="sourceAttribution != null and sourceAttribution != '' ">
             and mwbsa.CODE LIKE  CONCAT (#{sourceAttribution},'%')
         </if>
-        and mcb_warning_warning_info.WARNING_SOURCE_TYPE_CODE in (select code FROM amos_mcb.mcb_data_dictionary WHERE remark = 'OVERVIEW')
+        and mcb_warning_warning_info.WARNING_SOURCE_TYPE_CODE in (select code FROM mcb_data_dictionary WHERE remark = 'OVERVIEW')
 
   	</select>
     <select id="getMonthTotal" resultType="integer">
         SELECT
             count( 1 ) AS monNum
         FROM
-            amos_mcb.mcb_warning_warning_info
+            mcb_warning_warning_info
                 Left join mcb_warning_base_source_attribution mwbsa  on mwbsa.CODE = mcb_warning_warning_info.SOURCE_ATTRIBUTION
         WHERE
             MONTH(CREATE_DATE) = MONTH(CURDATE())
@@ -417,14 +417,14 @@
         <if test="sourceAttribution != null and sourceAttribution != '' ">
             and mwbsa.CODE LIKE  CONCAT (#{sourceAttribution},'%')
         </if>
-        and mcb_warning_warning_info.WARNING_SOURCE_TYPE_CODE in (select code FROM amos_mcb.mcb_data_dictionary WHERE remark = 'OVERVIEW')
+        and mcb_warning_warning_info.WARNING_SOURCE_TYPE_CODE in (select code FROM mcb_data_dictionary WHERE remark = 'OVERVIEW')
     </select>
     <select id="getDayTotal" resultType="integer">
         SELECT
             count( 1 ) AS dayNUM ,
             mwbsa.PROVINCE
         FROM
-            amos_mcb.mcb_warning_warning_info
+            mcb_warning_warning_info
                 Left join mcb_warning_base_source_attribution mwbsa  on mwbsa.CODE = mcb_warning_warning_info.SOURCE_ATTRIBUTION
         WHERE
             DATE_FORMAT(CREATE_DATE,'%Y-%m-%d') =  CURDATE()
@@ -434,6 +434,6 @@
         <if test="sourceAttribution != null and sourceAttribution != '' ">
             and mwbsa.CODE LIKE  CONCAT (#{sourceAttribution},'%')
         </if>
-        and mcb_warning_warning_info.WARNING_SOURCE_TYPE_CODE in (select code FROM amos_mcb.mcb_data_dictionary WHERE remark = 'OVERVIEW')
+        and mcb_warning_warning_info.WARNING_SOURCE_TYPE_CODE in (select code FROM mcb_data_dictionary WHERE remark = 'OVERVIEW')
 </select>
 </mapper>