内部执行导入

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

@@ -2,6 +2,9 @@ package com.rongwei.bscommon.sys.dao;
 
 import com.rongwei.bsentity.domain.ZhcxInsideInspectionDo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.rongwei.bsentity.vo.ZhcxInsideInspectionVo;
+import com.rongwei.rwadmincommon.system.domain.SysUserDo;
+import org.apache.ibatis.annotations.MapKey;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 import org.apache.ibatis.annotations.Update;
@@ -45,4 +48,24 @@ public interface ZhcxInsideInspectionDao extends BaseMapper<ZhcxInsideInspection
             "      u.ID = #{checkerId}" +
             "      AND uo.DELETED = '0'")
     List<Map<String, String>> getLaboratoryByCheckId(@Param("checkerId") String checkerId);
+
+    @Update("update INCONTROL.ZHCX_INSIDE_INSPECTION_DISPATCH a " +
+            "join ZHCX_INSIDE_INSPECTION b on a.INSIDEID = b.ID " +
+            "set a.SUPERVISIONID = #{supervisionid},a.SUPERVISION = #{supervision}," +
+            "a.SUPERVISIONPHONE = #{supervisionphone} " +
+            "where b.INSPECTIONCODE = #{inspectioncode}")
+    void updateSupervision(ZhcxInsideInspectionVo vo);
+
+    @Select("select * from (SELECT  su.* FROM sys_user su " +
+            "JOIN SYS_USER_ROLE sur ON sur.USERID = su.ID AND sur.DELETED = '0' " +
+            "JOIN SYS_ROLE sr ON sur.ROLEID = sr.ID AND sr.CODE IN " +
+            "('role055', 'role056', 'role057', 'role075', '059', 'role100', 'role103', 'role081') " +
+            "AND sr.DELETED = '0' " +
+            "JOIN SYS_USER_ORG suo ON suo.USERID = su.ID AND suo.DELETED = '0' " +
+            "JOIN SYS_ORGANIZATION so ON  suo.ORGID = so.ID AND so.FULLPID " +
+            "LIKE '%9820ed9d16d94f91a74524ff7ddfd24e%' AND so.DELETED = '0' " +
+            "WHERE  su.DELETED = '0' AND su.ACCOUNT != 'admin' AND su.ENABLED = '0') " +
+            "where 1=1")
+    @MapKey("name")
+    Map<String, SysUserDo> selectSupervision();
 }

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

@@ -4,8 +4,10 @@ import com.rongwei.bsentity.domain.ZhcxInsideInspectionDo;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.rongwei.bsentity.dto.InsideInspectionOperRequest;
 import com.rongwei.bsentity.dto.inside.*;
+import com.rongwei.bsentity.vo.ZhcxInsideInspectionVo;
 
 import javax.servlet.http.HttpServletResponse;
+import java.util.List;
 
 /**
  * <p>
@@ -91,4 +93,6 @@ public interface ZhcxInsideInspectionService extends IService<ZhcxInsideInspecti
      * @param response
      */
     int downloadFile(ZhcxInsideExportRequest exportReq, HttpServletResponse response);
+
+    void updateSupervision(List<ZhcxInsideInspectionVo> list);
 }

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

@@ -10,6 +10,7 @@ import cn.hutool.core.util.StrUtil;
 import cn.hutool.core.util.ZipUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.rongwei.bscommon.sys.service.ZhcxInsideInspectionDispatchService;
 import com.rongwei.bscommon.sys.service.ZhcxInsideInspectionOperLogService;
@@ -21,6 +22,7 @@ import com.rongwei.bscommon.sys.service.ZhcxInsideInspectionService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.rongwei.bsentity.dto.*;
 import com.rongwei.bsentity.dto.inside.*;
+import com.rongwei.bsentity.vo.ZhcxInsideInspectionVo;
 import com.rongwei.commonservice.serial.service.SysSerialNumberService;
 import com.rongwei.rwadmincommon.system.domain.SysRoleDo;
 import com.rongwei.rwadmincommon.system.domain.SysUserDo;
@@ -539,6 +541,41 @@ public class ZhcxInsideInspectionServiceImpl extends ServiceImpl<ZhcxInsideInspe
         return 2;
     }
 
+    @Override
+    public void updateSupervision(List<ZhcxInsideInspectionVo> list) {
+        Map<String, SysUserDo> userMap = dao.selectSupervision();
+        Map<String, ZhcxInsideInspectionDo> map = new HashMap<>(16);
+        for (ZhcxInsideInspectionVo vo: list) {
+            vo.setSupervision(vo.getSupervision().replace("'", ""));
+            vo.setInspectioncode(vo.getInspectioncode().replace("'", ""));
+            vo.setInspectionstatus(vo.getInspectionstatus().replace("'", ""));
+            vo.setSupervisionphone(vo.getSupervisionphone().replace("'", ""));
+            SysUserDo sysUserDo = userMap.get(vo.getSupervision());
+            if (!ObjectUtil.isNull(sysUserDo)) {
+                ZhcxInsideInspectionDo inspectionDo = map.get(sysUserDo.getId() + "gp");
+                if(ObjectUtil.isNull(inspectionDo)){
+                    inspectionDo = getLaboratoryByCheckId(sysUserDo.getId());
+                    if(ObjectUtil.isNull(inspectionDo)){
+                        continue;
+                    }
+                    map.put(sysUserDo.getId() + "gp", inspectionDo);
+                }
+                inspectionDo.setInspectioncode(vo.getInspectioncode());
+                String inspectionstatus = vo.getInspectionstatus();
+                if(!"待报验".equals(inspectionstatus)){
+                    continue;
+                }
+                if(sysUserDo != null){
+                    vo.setSupervisionid(sysUserDo.getId());
+                    dao.updateSupervision(vo);
+                }
+                UpdateWrapper<ZhcxInsideInspectionDo> updateWrapper = new UpdateWrapper<>();
+                updateWrapper.eq("inspectioncode", inspectionDo.getInspectioncode());
+                update(inspectionDo,updateWrapper);
+            }
+        }
+    }
+
     /**
      * 保存历史记录
      *

business-entity/src/main/java/com/rongwei/bsentity/vo/ZhcxInsideInspectionVo.java

@@ -0,0 +1,17 @@
+package com.rongwei.bsentity.vo;
+
+import lombok.Data;
+
+@Data
+public class ZhcxInsideInspectionVo {
+
+    private String inspectioncode;
+
+    private String inspectionstatus;
+
+    private String supervision;
+
+    private String supervisionid;
+
+    private String supervisionphone;
+}

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

@@ -1,21 +1,22 @@
 package com.rongwei.bsserver.controller;
 
 
+import cn.hutool.core.util.ObjectUtil;
+import com.alibaba.fastjson.JSON;
 import com.rongwei.bscommon.sys.service.ZhcxInsideInspectionService;
 import com.rongwei.bsentity.dto.InsideInspectionOperRequest;
 import com.rongwei.bsentity.dto.inside.*;
+import com.rongwei.bsentity.vo.ZhcxInsideInspectionVo;
 import com.rongwei.rwcommon.base.R;
 import com.rongwei.rwcommon.base.exception.CustomException;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -168,5 +169,23 @@ public class ZhcxInsideInspectionController {
         service.updateInspection(req);
         return R.ok();
     }
+
+    /**
+     * 内部执行导入
+     * @param file
+     * @param request
+     */
+    @PostMapping("/executeImport")
+    @ResponseBody
+    public R excelImport(@RequestBody Map<String,Object> map) {
+        Object dataObj = map.get("data");
+        if(ObjectUtil.isEmpty(dataObj)){
+            return R.error();
+        }
+        String data = (String) dataObj;
+        List<ZhcxInsideInspectionVo> list = JSON.parseArray(data, ZhcxInsideInspectionVo.class);
+        service.updateSupervision(list);
+        return R.ok();
+    }
 }