Browse Source

内部报验重新报验

wangming 11 months ago
parent
commit
6cb7bae9c6

+ 22 - 0
business-common/src/main/java/com/rongwei/bscommon/sys/dao/ZhcxInsideInspectionCoreIndicatorsDao.java

@@ -3,6 +3,7 @@ package com.rongwei.bscommon.sys.dao;
 import com.rongwei.bsentity.domain.ZhcxInsideInspectionCoreIndicatorsDo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Insert;
+import org.apache.ibatis.annotations.Update;
 
 import java.util.Map;
 
@@ -16,6 +17,27 @@ import java.util.Map;
  */
 public interface ZhcxInsideInspectionCoreIndicatorsDao extends BaseMapper<ZhcxInsideInspectionCoreIndicatorsDo> {
 
+    /**
+     * 清空
+     *
+     * @param entity
+     */
+    @Update("UPDATE  " +
+            " ZHCX_INSIDE_INSPECTION_CORE_INDICATORS  " +
+            "SET  " +
+            " SELFACTUALRECORD = NULL,  " +
+            " SELFRESULT = NULL,  " +
+            " SELFFILES = NULL,  " +
+            " SELFREMARK = NULL,  " +
+            " CHECKACTUALRECORD = NULL,  " +
+            " CHECKRESULT = NULL,  " +
+            " CHECKFILES = NULL,  " +
+            " CHECKREMARK = NULL  " +
+            "WHERE  " +
+            " INSIDEID = #{insideid}")
+    void reInspection(ZhcxInsideInspectionCoreIndicatorsDo entity);
+
+
     @Insert("INSERT INTO INCONTROL.ZHCX_INSIDE_INSPECTION_CORE_INDICATORS(ID,TENANTID,ROPTION,DELETED,REMARK,CREATEUSERID,CREATEUSERNAME,CREATEDATE,MODIFYUSERID,MODIFYUSERNAME,MODIFYDATE,INSIDEID,COREID,CORECODE,CORENAME,COREITEMID,INSPECTON_ITEMS,RECEIVING_CONDITIONS,ACCORDING_TO_STANDARDS,SELFACTUALRECORD,SELFRESULT,SELFFILES,SELFREMARK,CHECKACTUALRECORD,CHECKRESULT,CHECKFILES,CHECKREMARK,SORT) " +
             "select guid(),TENANTID,ROPTION,DELETED,REMARK,CREATEUSERID,CREATEUSERNAME,CREATEDATE,MODIFYUSERID,MODIFYUSERNAME,MODIFYDATE,#{newItpId},COREID,CORECODE,CORENAME,COREITEMID,INSPECTON_ITEMS,RECEIVING_CONDITIONS,ACCORDING_TO_STANDARDS,SELFACTUALRECORD,SELFRESULT,SELFFILES,SELFREMARK,CHECKACTUALRECORD,CHECKRESULT,CHECKFILES,CHECKREMARK,SORT FROM INCONTROL.ZHCX_INSIDE_INSPECTION_CORE_INDICATORS WHERE INSIDEID = #{itpId}")
     int insertBySelect(Map<String, String> map);

+ 8 - 0
business-common/src/main/java/com/rongwei/bscommon/sys/service/ZhcxInsideInspectionCoreIndicatorsService.java

@@ -15,6 +15,14 @@ import java.util.List;
  */
 public interface ZhcxInsideInspectionCoreIndicatorsService extends IService<ZhcxInsideInspectionCoreIndicatorsDo> {
 
+    /**
+     * 重新报验
+     * 清空用户填写数据
+     *
+     * @param insideId
+     */
+    void reInspection(String insideId);
+
     /**
      * 复制报验单核心检验指标
      *

+ 13 - 0
business-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ZhcxInsideInspectionCoreIndicatorsServiceImpl.java

@@ -26,6 +26,19 @@ public class ZhcxInsideInspectionCoreIndicatorsServiceImpl extends ServiceImpl<Z
     @Autowired
     private ZhcxInsideInspectionCoreIndicatorsDao dao;
 
+    /**
+     * 重新报验
+     * 清空用户填写数据
+     *
+     * @param insideId
+     */
+    @Override
+    public void reInspection(String insideId) {
+        ZhcxInsideInspectionCoreIndicatorsDo entity = new ZhcxInsideInspectionCoreIndicatorsDo();
+        entity.setInsideid(insideId);
+        dao.reInspection(entity);
+    }
+
     /**
      * 复制报验单核心检验指标
      *

+ 2 - 0
business-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ZhcxInsideInspectionServiceImpl.java

@@ -1044,6 +1044,8 @@ public class ZhcxInsideInspectionServiceImpl extends ServiceImpl<ZhcxInsideInspe
         } else {
             dispatchService.reInspection(dispatch.getId(), null);
         }
+
+        insideInspectionCoreIndicatorsService.reInspection(inside.getId());
     }
 
     /**