Merge remote-tracking branch 'origin/master'

business-common/src/main/java/com/rongwei/bscommon/sys/dao/ZhcxBiDatasourceDao.java

@@ -3,6 +3,7 @@ package com.rongwei.bscommon.sys.dao;
 import com.rongwei.bsentity.domain.ZhcxBiDatasourceDo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.rongwei.bsentity.vo.check.LargeScreenCheckVo;
+import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Update;
 
@@ -18,15 +19,15 @@ import java.util.List;
  */
 public interface ZhcxBiDatasourceDao extends BaseMapper<ZhcxBiDatasourceDo> {
 
-    @Update({"<script>",
-            "UPDATE INCONTROL.ZHCX_BI_DATASOURCE ",
-            "SET DELETED = '1' ",
-            "WHERE TAGID IN ",
-            "<foreach collection='tagIds' item='item' open='(' separator=',' close=')'>",
-            "#{item}",
-            "</foreach>",
-            " AND DELETED = '0'",
-            "</script>"})
+//    @Update({"<script>",
+//            "UPDATE INCONTROL.ZHCX_BI_DATASOURCE ",
+//            "SET DELETED = '1' ",
+//            "WHERE TAGID IN ",
+//            "<foreach collection='tagIds' item='item' open='(' separator=',' close=')'>",
+//            "#{item}",
+//            "</foreach>",
+//            " AND DELETED = '0'",
+//            "</script>"})
     void deleteDataByTagId(@Param("tagIds") List<String> tagIds);
 
     /**

business-common/src/main/java/com/rongwei/bscommon/sys/dao/ZhcxCheckBeforeQualifiedDao.java

@@ -0,0 +1,7 @@
+package com.rongwei.bscommon.sys.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.rongwei.bsentity.domain.ZhcxCheckBeforeQualifiedDo;
+
+public interface ZhcxCheckBeforeQualifiedDao extends BaseMapper<ZhcxCheckBeforeQualifiedDo> {
+}

business-common/src/main/java/com/rongwei/bscommon/sys/dao/ZhcxCommissionCheckDao.java

@@ -1,15 +1,15 @@
 package com.rongwei.bscommon.sys.dao;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.rongwei.bsentity.domain.ZhcxCommissionCheckDetailDo;
 import com.rongwei.bsentity.domain.ZhcxCommissionCheckDo;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.rongwei.bsentity.vo.check.LargeScreenCheckVo;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 
 /**
  * <p>
@@ -23,18 +23,21 @@ public interface ZhcxCommissionCheckDao extends BaseMapper<ZhcxCommissionCheckDo
 
     /**
      * 根据主表id 查询该机台是否已经发运
+     *
      * @return
      */
     int checkedShippedByMasterId(@Param("masterId") String masterId);
 
     /**
      * 根据主表id 查询该机台是否已经发运2(取项目清单)
+     *
      * @return
      */
     int checkedShippedByMasterId2(@Param("masterId") String masterId);
 
     /**
      * 根据主表id 查询该项目下还没有发运的机台
+     *
      * @param masterId
      * @return
      */
@@ -42,26 +45,30 @@ public interface ZhcxCommissionCheckDao extends BaseMapper<ZhcxCommissionCheckDo
 
     /**
      * 根据主表id 查询该项目下还没有发运的机台2(取项目清单)
+     *
      * @param masterId
      * @return
      */
     List<ZhcxCommissionCheckDo> getOtherShippeCheckList2(@Param("masterId") String masterId);
+
     /**
      * 删除试车检查内容下的所有子表(危险操作)
+     *
      * @param pid 试车检查主表id
      */
     void deleteCheckDetailByPid(@Param("pid") String pid);
 
     /**
      * 根据pid和源标准库章节号找到可能存在填写过的子表数据
-     * @param pid 试车主表id
+     *
+     * @param pid       试车主表id
      * @param chapterno 标准库章节号
      * @return
      */
-    List<ZhcxCommissionCheckDetailDo> selectDetailListByPidAndChapterno(@Param("pid")String pid, @Param("chapterno")String chapterno);
+    List<ZhcxCommissionCheckDetailDo> selectDetailListByPidAndChapterno(@Param("pid") String pid, @Param("chapterno") String chapterno);
 
 
-    List<ZhcxCommissionCheckDetailDo> selectHistoryDetailList(@Param("pid")String pid);
+    List<ZhcxCommissionCheckDetailDo> selectHistoryDetailList(@Param("pid") String pid);
 
     default Map<String, ZhcxCommissionCheckDetailDo> getHistoryDetailMap(String pid) {
         List<ZhcxCommissionCheckDetailDo> list = selectHistoryDetailList(pid);
@@ -74,25 +81,33 @@ public interface ZhcxCommissionCheckDao extends BaseMapper<ZhcxCommissionCheckDo
 
     /**
      * 删除试车检查内容下的所有树表(危险操作_直删)
+     *
      * @param pid 试车检查主表id
      */
     void deleteTreeByPid(@Param("pid") String pid);
 
     /**
      * 获取大屏试车数据
+     *
      * @return
      */
     List<LargeScreenCheckVo> getLargeScreenData(Map<String, Object> map);
 
     /**
      * 删除标准库子表数据(伪删)
+     *
      * @param pid 父id
      */
     void deleteBaseInfoDetailByPid(@Param("pid") String pid);
 
     /**
      * 删除标准库子表数据(伪删)
+     *
      * @param pid 父id
      */
     void deleteBaseInfoTreeByPid(@Param("pid") String pid);
+
+    void delCoreInspectionDetail(@Param("delpids") HashSet<String> delpids);
+
+    void delCheckBeforeQualified(@Param("delpids") HashSet<String> delpids);
 }

business-common/src/main/java/com/rongwei/bscommon/sys/dao/ZhcxCoreInspectionDetailDao.java

@@ -0,0 +1,7 @@
+package com.rongwei.bscommon.sys.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.rongwei.bsentity.domain.ZhcxCoreInspectionDetailDo;
+
+public interface ZhcxCoreInspectionDetailDao extends BaseMapper<ZhcxCoreInspectionDetailDo> {
+}

business-common/src/main/java/com/rongwei/bscommon/sys/dao/ZhcxCoreInspectionIndicatorsTemplateDao.java

@@ -0,0 +1,7 @@
+package com.rongwei.bscommon.sys.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.rongwei.bsentity.domain.ZhcxCoreInspectionIndicatorsTemplateDo;
+
+public interface ZhcxCoreInspectionIndicatorsTemplateDao extends BaseMapper<ZhcxCoreInspectionIndicatorsTemplateDo> {
+}

business-common/src/main/java/com/rongwei/bscommon/sys/service/ZhcxCheckBeforeQualifiedService.java

@@ -0,0 +1,7 @@
+package com.rongwei.bscommon.sys.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.rongwei.bsentity.domain.ZhcxCheckBeforeQualifiedDo;
+
+public interface ZhcxCheckBeforeQualifiedService extends IService<ZhcxCheckBeforeQualifiedDo> {
+}

business-common/src/main/java/com/rongwei/bscommon/sys/service/ZhcxCommissionCheckService.java

@@ -1,7 +1,7 @@
 package com.rongwei.bscommon.sys.service;
 
-import com.rongwei.bsentity.domain.ZhcxCommissionCheckDo;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.rongwei.bsentity.domain.ZhcxCommissionCheckDo;
 import com.rongwei.bsentity.dto.CheckDetailDTO;
 import com.rongwei.bsentity.dto.CommissionCheckDTO;
 import com.rongwei.bsentity.dto.commission.ImportProjectCheckBO;
@@ -10,6 +10,7 @@ import com.rongwei.rwcommon.base.R;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
 import java.util.Map;
 
 /**
@@ -24,6 +25,7 @@ public interface ZhcxCommissionCheckService extends IService<ZhcxCommissionCheck
 
     /**
      * 试车报告新增
+     *
      * @param checkDTO 参数
      * @return 响应状态
      */
@@ -31,6 +33,7 @@ public interface ZhcxCommissionCheckService extends IService<ZhcxCommissionCheck
 
     /**
      * 试车报告子表同步更新其他机台
+     *
      * @param detailDTO 参数
      * @return 响应状态
      */
@@ -38,6 +41,7 @@ public interface ZhcxCommissionCheckService extends IService<ZhcxCommissionCheck
 
     /**
      * 试车报告导出
+     *
      * @param map
      * @param response
      * @return
@@ -46,6 +50,7 @@ public interface ZhcxCommissionCheckService extends IService<ZhcxCommissionCheck
 
     /**
      * 试车检查报告导出
+     *
      * @param map
      * @param response
      * @return
@@ -54,6 +59,7 @@ public interface ZhcxCommissionCheckService extends IService<ZhcxCommissionCheck
 
     /**
      * 试车标准库导出
+     *
      * @param map
      * @param response
      * @return
@@ -85,14 +91,16 @@ public interface ZhcxCommissionCheckService extends IService<ZhcxCommissionCheck
 
     /**
      * 标准库导入
+     *
      * @param file
      * @param mainId
      * @return
      */
-    R importStandard(MultipartFile file,String mainId);
+    R importStandard(MultipartFile file, String mainId);
 
     /**
      * 项目导出试车模版
+     *
      * @param map
      * @param response
      * @return
@@ -102,12 +110,15 @@ public interface ZhcxCommissionCheckService extends IService<ZhcxCommissionCheck
     /**
      * 大屏数据源(试车)
      */
-    void largeScreenData(Map<String,Object> map);
+    void largeScreenData(Map<String, Object> map);
 
     /**
      * 试车检查报告生成标准库
-      * @param checkId 试车检查报告主表id
+     *
+     * @param checkId 试车检查报告主表id
      * @return
      */
     R generateStandardLibrary(String checkId);
+
+    R saveImportInspect(MultipartFile file) throws Exception;
 }

business-common/src/main/java/com/rongwei/bscommon/sys/service/ZhcxCoreInspectionDetailService.java

@@ -0,0 +1,7 @@
+package com.rongwei.bscommon.sys.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.rongwei.bsentity.domain.ZhcxCoreInspectionDetailDo;
+
+public interface ZhcxCoreInspectionDetailService extends IService<ZhcxCoreInspectionDetailDo> {
+}

business-common/src/main/java/com/rongwei/bscommon/sys/service/ZhcxCoreInspectionIndicatorsTemplateService.java

@@ -0,0 +1,7 @@
+package com.rongwei.bscommon.sys.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.rongwei.bsentity.domain.ZhcxCoreInspectionIndicatorsTemplateDo;
+
+public interface ZhcxCoreInspectionIndicatorsTemplateService extends IService<ZhcxCoreInspectionIndicatorsTemplateDo> {
+}

business-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ZhcxCheckBeforeQualifiedImpl.java

@@ -0,0 +1,13 @@
+package com.rongwei.bscommon.sys.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.rongwei.bscommon.sys.dao.ZhcxCheckBeforeQualifiedDao;
+import com.rongwei.bscommon.sys.service.ZhcxCheckBeforeQualifiedService;
+import com.rongwei.bsentity.domain.ZhcxCheckBeforeQualifiedDo;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+@Service
+@Slf4j
+public class ZhcxCheckBeforeQualifiedImpl extends ServiceImpl<ZhcxCheckBeforeQualifiedDao, ZhcxCheckBeforeQualifiedDo> implements ZhcxCheckBeforeQualifiedService {
+}

business-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ZhcxCoreInspectionDetailImpl.java

@@ -0,0 +1,13 @@
+package com.rongwei.bscommon.sys.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.rongwei.bscommon.sys.dao.ZhcxCoreInspectionDetailDao;
+import com.rongwei.bscommon.sys.service.ZhcxCoreInspectionDetailService;
+import com.rongwei.bsentity.domain.ZhcxCoreInspectionDetailDo;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+@Service
+@Slf4j
+public class ZhcxCoreInspectionDetailImpl extends ServiceImpl<ZhcxCoreInspectionDetailDao, ZhcxCoreInspectionDetailDo> implements ZhcxCoreInspectionDetailService {
+}

business-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ZhcxCoreInspectionIndicatorsTemplateImpl.java

@@ -0,0 +1,13 @@
+package com.rongwei.bscommon.sys.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.rongwei.bscommon.sys.dao.ZhcxCoreInspectionIndicatorsTemplateDao;
+import com.rongwei.bscommon.sys.service.ZhcxCoreInspectionIndicatorsTemplateService;
+import com.rongwei.bsentity.domain.ZhcxCoreInspectionIndicatorsTemplateDo;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+@Service
+@Slf4j
+public class ZhcxCoreInspectionIndicatorsTemplateImpl extends ServiceImpl<ZhcxCoreInspectionIndicatorsTemplateDao, ZhcxCoreInspectionIndicatorsTemplateDo> implements ZhcxCoreInspectionIndicatorsTemplateService {
+}

business-common/src/main/resources/mybatis/business/ZhcxBiDatasourceDao.xml

@@ -2,6 +2,13 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
 <mapper namespace="com.rongwei.bscommon.sys.dao.ZhcxBiDatasourceDao">
+    <delete id="deleteDataByTagId">
+        DELETE FROM INCONTROL.ZHCX_BI_DATASOURCE
+        WHERE TAGID IN
+        <foreach collection="tagIds" item="item" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </delete>
 
 
     <select id="getAllMachineInfo" resultType="com.rongwei.bsentity.vo.check.LargeScreenCheckVo">

business-common/src/main/resources/mybatis/business/ZhcxCommissionCheckDao.xml

@@ -3,7 +3,7 @@
 
 <mapper namespace="com.rongwei.bscommon.sys.dao.ZhcxCommissionCheckDao">
 
-    <update id="deleteCheckDetailByPid" >
+    <update id="deleteCheckDetailByPid">
         UPDATE ZHCX_COMMISSION_CHECK_DETAIL SET DELETED = '1' WHERE PID = #{pid} and DELETED = '0'
     </update>
 
@@ -122,53 +122,69 @@
     </select>
 
     <select id="getLargeScreenData" resultType="com.rongwei.bsentity.vo.check.LargeScreenCheckVo">
-        SELECT c.MACHINEID   as machinenoid,
-               c.MACHINENO   as machineno,
-               c.PROJECTCODE as projectcode,
-               c.PROJECTID   as projectid,
-               c.PROJECTNAME as projectname,
-               CASE
-                   WHEN b.qaresult IS NULL THEN '0'
-                   WHEN b.qaresult = 0 THEN '0'
-                   ELSE b.qaresult
-                   END     as molecule,
-               CASE
-                   WHEN b.total IS NULL THEN '0'
-                   WHEN b.total = 0 THEN '0'
-                   ELSE (b.total - b.na2)
-                   END     as denominator,
-               CASE
-                   WHEN b.qaalltesttime_cx IS NULL THEN '0'
-                   WHEN b.qaalltesttime_cx = 0 THEN '0'
-                   WHEN b.qatesttime_cx IS NULL THEN '0'
-                   WHEN b.qatesttime_cx = 0 THEN '0'
-                   ELSE ROUND(b.qatesttime_cx / b.qaalltesttime_cx, 4)
-                   END     AS qaprogress,
-               se.ESTIMATEDENDDATE as endData
-        FROM INCONTROL.ZHCX_COMMISSION_CHECK c
-                 LEFT JOIN (SELECT PID,
-                                   count(*)                                               AS total,
-                                   SUM(CASE WHEN det.TESTRESULT = '20' THEN 1 ELSE 0 END) AS na2,
-                                   SUM(CASE WHEN det.TESTRESULT = '30' THEN 1 ELSE 0 END) AS qaresult,
-                                   SUM(CASE
-                                           WHEN (det.TESTRESULT NOT IN ('20') OR det.TESTRESULT IS NULL) AND
-                                                (det.TESTADDRESS = '10' OR det.TESTADDRESS IS NULL) THEN det.TESTTIME
-                                           ELSE 0 END)                                    AS qaalltesttime_cx,
-                                   SUM(CASE
-                                           WHEN det.TESTRESULT = '30' AND (det.TESTADDRESS = '10' OR det.TESTADDRESS IS NULL)
-                                               THEN det.TESTTIME
-                                           ELSE 0 END)                                    AS qatesttime_cx
-                            FROM INCONTROL.ZHCX_COMMISSION_CHECK_DETAIL det
-                            WHERE det.DELETED = '0'
-                            GROUP BY PID) b ON b.PID = c.ID
+        SELECT c.MACHINEID as machinenoid,
+            c.MACHINENO as machineno,
+            c.PROJECTCODE as projectcode,
+            c.PROJECTID as projectid,
+            c.PROJECTNAME as projectname,
+            CASE
+            WHEN b.qaresult IS NULL THEN '0'
+            WHEN b.qaresult = 0 THEN '0'
+            ELSE b.qaresult
+            END as molecule,
+            CASE
+            WHEN b.total IS NULL THEN '0'
+            WHEN b.total = 0 THEN '0'
+            ELSE (b.total - b.na2)
+            END as denominator,
+            CASE
+            WHEN b.qaalltesttime_cx IS NULL THEN '0'
+            WHEN b.qaalltesttime_cx = 0 THEN '0'
+            WHEN b.qatesttime_cx IS NULL THEN '0'
+            WHEN b.qatesttime_cx = 0 THEN '0'
+            ELSE ROUND(b.qatesttime_cx / b.qaalltesttime_cx, 4)
+            END AS qaprogress,
+            se.ESTIMATEDENDDATE as endData
+            FROM INCONTROL.ZHCX_COMMISSION_CHECK c
+            LEFT JOIN (SELECT PID,
+            count(*) AS total,
+            SUM(CASE WHEN det.TESTRESULT = '20' THEN 1 ELSE 0 END) AS na2,
+            SUM(CASE WHEN det.TESTRESULT = '30' THEN 1 ELSE 0 END) AS qaresult,
+            SUM(CASE
+            WHEN (det.TESTRESULT NOT IN ('20') OR det.TESTRESULT IS NULL) AND
+            (det.TESTADDRESS = '10' OR det.TESTADDRESS IS NULL) THEN det.TESTTIME
+            ELSE 0 END) AS qaalltesttime_cx,
+            SUM(CASE
+            WHEN det.TESTRESULT = '30' AND (det.TESTADDRESS = '10' OR det.TESTADDRESS IS NULL)
+            THEN det.TESTTIME
+            ELSE 0 END) AS qatesttime_cx
+        FROM INCONTROL.ZHCX_COMMISSION_CHECK_DETAIL det
+        WHERE det.DELETED = '0'
+        GROUP BY PID) b ON b.PID = c.ID
         LEFT JOIN INCONTROL.ZHCX_COMMISSION_CHECK_PARAMETER_SET_DETAL se on se.CHECKID = c.ID AND se.DELETED = '0'
         WHERE c.DELETED = '0'
-        <if test='projectId != null'> and c.PROJECTID = #{projectId} </if>
-        <if test='machineno != null'> and c.MACHINENO = #{machineno} </if>
-          and EXISTS (SELECT *
-                      FROM INCONTROL.ZHCX_SHIP_OFFSHORE_DETAIL d
-                      WHERE d.PROJECTID = c.PROJECTID
-                        AND d.MACHINENO = c.MACHINENO
-                        AND d.DELETED = '0')
+        <if test='projectId != null'>and c.PROJECTID = #{projectId}</if>
+        <if test='machineno != null'>and c.MACHINENO = #{machineno}</if>
+        and EXISTS (SELECT *
+        FROM INCONTROL.ZHCX_SHIP_OFFSHORE_DETAIL d
+        WHERE d.PROJECTID = c.PROJECTID
+        AND d.MACHINENO = c.MACHINENO
+        AND d.DELETED = '0')
     </select>
+
+    <update id="delCoreInspectionDetail">
+        update ZHCX_CORE_INSPECTION_DETAIL set DELETED='1' where DELETED='0' and
+        PID in
+        <foreach collection="delpids" item="delpid" index="index" open="(" close=")" separator=",">
+            #{delpid}
+        </foreach>
+    </update>
+
+    <update id="delCheckBeforeQualified">
+        update ZHCX_CHECK_BEFORE_QUALIFIED set DELETED='1' where DELETED='0' and
+        PID in
+        <foreach collection="delpids" item="delpid" index="index" open="(" close=")" separator=",">
+            #{delpid}
+        </foreach>
+    </update>
 </mapper>

business-entity/src/main/java/com/rongwei/bsentity/domain/ZhcxCoreInspectionDetailDo.java

@@ -75,4 +75,9 @@ public class ZhcxCoreInspectionDetailDo extends BaseDo {
      */
     @TableField("ACCORDING_TO_FILES")
     private String according_to_files;
+    /**
+     * 错误实例
+     */
+    @TableField("ERRORFILES")
+    private String errorfiles;
 }

business-server/src/main/java/com/rongwei/bsserver/controller/ZhcxCommissionCheckController.java

@@ -3,10 +3,10 @@ package com.rongwei.bsserver.controller;
 
 import com.rongwei.bscommon.sys.service.ZhcxCommissionCheckService;
 import com.rongwei.bscommon.sys.utils.ExceptionUtils;
+import com.rongwei.bscommon.sys.utils.FileCheckUtil;
 import com.rongwei.bsentity.dto.CheckDetailDTO;
 import com.rongwei.bsentity.dto.CommissionCheckDTO;
 import com.rongwei.bsentity.dto.commission.ImportProjectCheckDto;
-import com.rongwei.bscommon.sys.utils.FileCheckUtil;
 import com.rongwei.rwcommon.base.R;
 import com.rongwei.rwcommon.utils.StringUtils;
 import io.swagger.annotations.ApiOperation;
@@ -119,6 +119,21 @@ public class ZhcxCommissionCheckController {
         return R.ok();
     }
 
+    //核心检验指标导入
+    @RequestMapping("inspectWordImport")
+    @ResponseBody
+    public R inspectWordImport(@RequestParam MultipartFile file) {
+        if (file == null) {
+            return R.error("文件解析失败");
+        }
+        try {
+            return commissionCheckService.saveImportInspect(file);
+        } catch (Exception e) {
+            ExceptionUtils.printExceptionDetail(e, "核心检验指标导入异常");
+            return R.error("核心检验指标导入异常");
+        }
+    }
+
     @RequestMapping("importStandard")
     @ResponseBody
     public R importStandard(@RequestParam MultipartFile file, String mainId) {