From 4d758edb4a9666a2263225b13143cbe4f42d0010 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=9F=A9=E5=9B=BD=E4=B8=9C?= <mythxb@qq.com>
Date: Thu, 16 Feb 2023 11:14:17 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E8=A1=8C=E4=B8=9A=E7=AD=9B?=
 =?UTF-8?q?=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/mapper/NewsCntMapper.xml   |  2 +-
 .../mapper/check/ChkBillDetailMapper.xml      |  4 +-
 .../mapper/ent/BaseInClassMapper.xml          |  2 -
 .../com/rzyc/controller/BaseController.java   | 63 ++++++++++---------
 .../controller/ent/PcCompanyController.java   | 10 +--
 5 files changed, 42 insertions(+), 39 deletions(-)

diff --git a/inventory-dao/src/main/resources/mapper/NewsCntMapper.xml b/inventory-dao/src/main/resources/mapper/NewsCntMapper.xml
index e586007..2fe5d94 100644
--- a/inventory-dao/src/main/resources/mapper/NewsCntMapper.xml
+++ b/inventory-dao/src/main/resources/mapper/NewsCntMapper.xml
@@ -594,7 +594,7 @@
       nc.CreatedOn, nc.CreatedBy, nc.ModifiedOn, nc.ModifiedBy,nc.PublicTime
     FROM NewsCnt nc
            LEFT JOIN NewsClass nl ON nc.`NewsClassId` = nl.`NewsClassId`
-    WHERE nc.`NewTitle` LIKE #{‘}
+    WHERE nc.`NewTitle` LIKE #{condition}
       AND nc.`NewsClassId` IS NOT NULL
     <if test="null != newsClassId and '' != newsClassId">
       AND nc.`NewsClassId` = #{newsClassId}
diff --git a/inventory-dao/src/main/resources/mapper/check/ChkBillDetailMapper.xml b/inventory-dao/src/main/resources/mapper/check/ChkBillDetailMapper.xml
index acb8b6d..5de53c9 100644
--- a/inventory-dao/src/main/resources/mapper/check/ChkBillDetailMapper.xml
+++ b/inventory-dao/src/main/resources/mapper/check/ChkBillDetailMapper.xml
@@ -794,7 +794,9 @@
   <!--企业检查-->
   <select id="entChkBillPC" resultMap="ResultMapWithBLOBs">
     SELECT cd.* FROM `ChkBillDetail` cd
-    WHERE cd.`BaseInClassId` like concat('%',#{baseInClassId},'%') and del_state = 1
+    WHERE 1 = 1
+    <!--and cd.`BaseInClassId` like concat('%',#{baseInClassId},'%') -->
+    and del_state = 1
     AND
     (
     <foreach collection ="baseSafeClassIds" item="baseSafeClassId" index= "index" separator ="or">
diff --git a/inventory-dao/src/main/resources/mapper/ent/BaseInClassMapper.xml b/inventory-dao/src/main/resources/mapper/ent/BaseInClassMapper.xml
index 7de98cf..c85ab80 100644
--- a/inventory-dao/src/main/resources/mapper/ent/BaseInClassMapper.xml
+++ b/inventory-dao/src/main/resources/mapper/ent/BaseInClassMapper.xml
@@ -355,8 +355,6 @@
     t2.BaseInClassId BaseInClassIdChild,t2.ClassCode ClassCodeChild,
            t2.IndustryClassName IndustryClassNameChild,t2.SuperInId as SuperInIdChild
      from BaseInClass t1 LEFT join BaseInClass t2 on t1.BaseInClassId = t2.SuperInId
-    where t1.SuperInId is null
-
   </select>
 
     <select id="findAll" resultMap="BaseResultMap">
diff --git a/inventory-gov/src/main/java/com/rzyc/controller/BaseController.java b/inventory-gov/src/main/java/com/rzyc/controller/BaseController.java
index 75ec808..79214cc 100644
--- a/inventory-gov/src/main/java/com/rzyc/controller/BaseController.java
+++ b/inventory-gov/src/main/java/com/rzyc/controller/BaseController.java
@@ -1668,36 +1668,39 @@ public class BaseController {
      * */
     public List<String>exchange(String id,int type){
         List<String>stringList = new ArrayList<>();
-        String [] arr = id.split(",");
-           if (type == 1){
-               List<BaseSafeClass>baseSafeClasses = baseSafeClassMapper.findAll();
-               for (String ar:arr) {
-                   for (BaseSafeClass bs:baseSafeClasses) {
-                       if (ar.equals(bs.getBasesafeclassid())){
-                           stringList.add(bs.getSafeclassname());
-                       }
-                   }
-               }
-           }else if(type == 2){
-               List<BaseInClass>baseInClasses = baseInClassMapper.findAll();
-               for (String ar:arr) {
-                   for (BaseInClass bi:baseInClasses) {
-                       if (ar.equals(bi.getBaseinclassid())){
-                           stringList.add(bi.getIndustryclassname());
-                       }
-                   }
-               }
-           }else if(type == 3){
-               List<BaseInClass>baseInClasses = baseInClassMapper.findAll();
-               for (String ar:arr) {
-                   for (BaseInClass bi:baseInClasses) {
-                       if (ar.equals(bi.getBaseinclassid())){
-                           stringList.add(bi.getIndustryclassname());
-                       }
-                   }
-               }
-           }
-           return stringList;
+        if(StringUtils.isNotBlank(id)){
+            String [] arr = id.split(",");
+            if (type == 1){
+                List<BaseSafeClass>baseSafeClasses = baseSafeClassMapper.findAll();
+                for (String ar:arr) {
+                    for (BaseSafeClass bs:baseSafeClasses) {
+                        if (ar.equals(bs.getBasesafeclassid())){
+                            stringList.add(bs.getSafeclassname());
+                        }
+                    }
+                }
+            }else if(type == 2){
+                List<BaseInClass>baseInClasses = baseInClassMapper.findAll();
+                for (String ar:arr) {
+                    for (BaseInClass bi:baseInClasses) {
+                        if (ar.equals(bi.getBaseinclassid())){
+                            stringList.add(bi.getIndustryclassname());
+                        }
+                    }
+                }
+            }else if(type == 3){
+                List<BaseInClass>baseInClasses = baseInClassMapper.findAll();
+                for (String ar:arr) {
+                    for (BaseInClass bi:baseInClasses) {
+                        if (ar.equals(bi.getBaseinclassid())){
+                            stringList.add(bi.getIndustryclassname());
+                        }
+                    }
+                }
+            }
+        }
+
+        return stringList;
     }
 
     /**
diff --git a/inventory-gov/src/main/java/com/rzyc/controller/ent/PcCompanyController.java b/inventory-gov/src/main/java/com/rzyc/controller/ent/PcCompanyController.java
index 2ede0d7..8d8718d 100644
--- a/inventory-gov/src/main/java/com/rzyc/controller/ent/PcCompanyController.java
+++ b/inventory-gov/src/main/java/com/rzyc/controller/ent/PcCompanyController.java
@@ -520,9 +520,8 @@ public class PcCompanyController extends com.rzyc.controller.BaseController {
         SingleResult singleResult = new SingleResult();
         //查询唯一的一个日常检查
         ChkGovBill chkGovBill = chkGovBillMapper.selectByCompanyId(sysEnterprise.getSysenterpriseid());
-        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMddHHmmss");
-        String token = servletRequest.getHeader("userToken");
-        String userId = JwtUtil.getTokenMsg(token);
+
+        String userId = getUserId();
         SysUser sysUser = super.getUser(userId);
         if (chkGovBill ==  null){
         /**
@@ -536,7 +535,7 @@ public class PcCompanyController extends com.rzyc.controller.BaseController {
             chkGovBill.setBasesafeclassid(sysEnterprise.getBasesafeclassid());
             chkGovBill.setChkbillname(sysEnterprise.getEntname() + "日常检查");
             chkGovBill.setSysEnterpriseId(sysEnterprise.getSysenterpriseid());
-            chkGovBill.setChkbillno(simpleDateFormat.format(new Date()));
+            chkGovBill.setChkbillno(DateUtils.getNowDateTimeStr("yyyyMMddHHmmss"));
             chkGovBill.setChkbilldate(new Timestamp(System.currentTimeMillis()));
             chkGovBill.setCreatedby(sysUser.getChinaname());
             chkGovBill.setCreatedon(new Date());
@@ -560,7 +559,7 @@ public class PcCompanyController extends com.rzyc.controller.BaseController {
             chkGovBill.setBasesafeclassid(sysEnterprise.getBasesafeclassid());
             chkGovBill.setChkbillname(sysEnterprise.getEntname() + "日常检查");
             chkGovBill.setSysEnterpriseId(sysEnterprise.getSysenterpriseid());
-            chkGovBill.setChkbillno(simpleDateFormat.format(new Date()));
+            chkGovBill.setChkbillno(DateUtils.getNowDateTimeStr("yyyyMMddHHmmss"));
             chkGovBill.setModifiedby(sysUser.getChinaname());
             chkGovBill.setModifiedon(new Date());
             chkGovBill.setSysUnitId(sysEnterprise.getManagerDept());
@@ -578,6 +577,7 @@ public class PcCompanyController extends com.rzyc.controller.BaseController {
             con.setModifiedby(sysUser.getChinaname());
             entBillConMapper.insert(con);
         }
+
         /**查询检查项*/
         String [] safe = sysEnterprise.getBasesafeclassid().split(",");
         List<String> list = Arrays.asList(safe);