Jelajahi Sumber

新增派单明细导入sop

wangliang 1 tahun lalu
induk
melakukan
32e293682e

+ 2 - 3
sop-api/src/main/java/com/qmth/sop/server/api/TBCrmDetailController.java

@@ -46,8 +46,7 @@ public class TBCrmDetailController {
     @RequestMapping(value = "/sop/import", method = RequestMethod.POST)
     @ApiResponses({ @ApiResponse(code = 200, message = "导入成功", response = EditResult.class) })
     public Result sopImport(@ApiParam(value = "上传文件", required = true) @RequestParam MultipartFile file,
-            @ApiParam(value = "派单号", required = true) @RequestParam String crmNo,
-            @ApiParam(value = "过程变量", required = true) @RequestParam String processVar) throws IOException {
+            @ApiParam(value = "派单号", required = true) @RequestParam String crmNo) throws IOException {
         boolean lock = memoryLock.lock(SystemConstant.LOCK_CRM_DETAIL_SOP_PREFIX + crmNo, crmNo,
                 SystemConstant.LOCK_CRM_DETAIL_SOP_TIME_OUT);
         if (!lock) {
@@ -55,7 +54,7 @@ public class TBCrmDetailController {
         }
         Map<String, String> map = null;
         try {
-            map = tbCrmDetailService.sopExcelImport(file, crmNo, processVar);
+            map = tbCrmDetailService.sopExcelImport(file, crmNo);
         } catch (Exception e) {
             log.error(SystemConstant.LOG_ERROR, e);
             if (e instanceof ApiException) {

+ 1 - 2
sop-business/src/main/java/com/qmth/sop/business/service/TBCrmDetailService.java

@@ -22,9 +22,8 @@ public interface TBCrmDetailService extends IService<TBCrmDetail> {
      *
      * @param file
      * @param crmNo
-     * @param processVar
      * @return
      * @throws IOException
      */
-    public Map<String, String> sopExcelImport(MultipartFile file, String crmNo, String processVar) throws IOException;
+    public Map<String, String> sopExcelImport(MultipartFile file, String crmNo) throws IOException;
 }

+ 1 - 6
sop-business/src/main/java/com/qmth/sop/business/service/impl/TBCrmDetailServiceImpl.java

@@ -62,13 +62,12 @@ public class TBCrmDetailServiceImpl extends ServiceImpl<TBCrmDetailMapper, TBCrm
      *
      * @param file
      * @param crmNo
-     * @param processVar
      * @return
      * @throws IOException
      */
     @Override
     @Transactional
-    public Map<String, String> sopExcelImport(MultipartFile file, String crmNo, String processVar) throws IOException {
+    public Map<String, String> sopExcelImport(MultipartFile file, String crmNo) throws IOException {
         log.debug("导入Excel开始...");
         long start = System.currentTimeMillis();
 
@@ -116,10 +115,6 @@ public class TBCrmDetailServiceImpl extends ServiceImpl<TBCrmDetailMapper, TBCrm
                     tbCrmDetailService.saveBatch(tbCrmDetailList);
                 }
             }
-            tbCrm.setProcessVar(processVar);
-            tbCrm.updateInfo(sysUser.getId());
-            tbCrmService.updateById(tbCrm);
-
             messageMap.put(SystemConstant.SUCCESS, successData.length() > 0 ? successData.toString() : "无");
             messageMap.put(SystemConstant.EXCEL_ERROR, errorData.length() > 0 ? errorData.toString() : "无");
         } catch (Exception e) {