Merge remote-tracking branch 'origin/dev_1.1.0' into dev_1.1.0

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

@@ -1,10 +1,12 @@
 package com.qmth.sop.server.api;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.qmth.boot.api.constant.ApiConstant;
 import com.qmth.boot.api.exception.ApiException;
 import com.qmth.sop.business.bean.result.EditResult;
 import com.qmth.sop.business.entity.TBCrmDetail;
 import com.qmth.sop.business.service.TBCrmDetailService;
+import com.qmth.sop.business.service.TBCrmService;
 import com.qmth.sop.common.annotation.OperationLog;
 import com.qmth.sop.common.contant.SystemConstant;
 import com.qmth.sop.common.enums.ExceptionResultEnum;
@@ -45,11 +47,15 @@ public class TBCrmDetailController {
     @Resource
     TBCrmDetailService tbCrmDetailService;
 
+    @Resource
+    TBCrmService tbCrmService;
+
     @ApiOperation(value = "获取派单信息")
     @RequestMapping(value = "/sop/var/info", method = RequestMethod.POST)
+    @OperationLog(logType = LogTypeEnum.SEARCH)
     @ApiResponses({ @ApiResponse(code = 200, message = "派单信息", response = EditResult.class) })
     public Result info(@ApiParam(value = "派单号", required = true) @RequestParam String crmNo) {
-        return ResultUtil.ok(true);
+        return ResultUtil.ok(tbCrmService.findCrmProjectBySopNoOrCrmNo(null, crmNo));
     }
 
     @ApiOperation(value = "派单明细sop变量保存")
@@ -68,7 +74,7 @@ public class TBCrmDetailController {
     public Result sopInfo(@ApiParam(value = "派单号", required = true) @RequestParam String crmNo,
             @ApiParam(value = "分页页码", required = true) @RequestParam @Min(SystemConstant.PAGE_NUMBER_MIN) Integer pageNumber,
             @ApiParam(value = "分页数", required = true) @RequestParam @Min(SystemConstant.PAGE_SIZE_MIN) @Max(SystemConstant.PAGE_SIZE_MAX) Integer pageSize) {
-        return ResultUtil.ok(true);
+        return ResultUtil.ok(tbCrmDetailService.list(new Page<>(pageNumber, pageSize), crmNo));
     }
 
     @ApiOperation(value = "创建/编辑派单明细sop")

sop-business/src/main/java/com/qmth/sop/business/mapper/TBCrmDetailMapper.java

@@ -1,7 +1,11 @@
 package com.qmth.sop.business.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.qmth.sop.business.entity.TBCrmDetail;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.Map;
 
 /**
  * <p>
@@ -13,4 +17,12 @@ import com.qmth.sop.business.entity.TBCrmDetail;
  */
 public interface TBCrmDetailMapper extends BaseMapper<TBCrmDetail> {
 
+    /**
+     * 查询派单明细sop信息列表
+     *
+     * @param iPage
+     * @param crmNo
+     * @return
+     */
+    IPage<TBCrmDetail> list(IPage<Map> iPage, @Param("crmNo") String crmNo);
 }

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

@@ -1,5 +1,6 @@
 package com.qmth.sop.business.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.qmth.sop.business.entity.TBCrmDetail;
 import org.springframework.web.multipart.MultipartFile;
@@ -33,4 +34,13 @@ public interface TBCrmDetailService extends IService<TBCrmDetail> {
      * @return
      */
     public Map<String, String> sopExcelImport(MultipartFile file, String crmNo);
+
+    /**
+     * 查询派单明细sop信息列表
+     *
+     * @param iPage
+     * @param crmNo
+     * @return
+     */
+    public IPage<TBCrmDetail> list(IPage<Map> iPage, String crmNo);
 }

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

@@ -1,6 +1,7 @@
 package com.qmth.sop.business.service.impl;
 
 import com.alibaba.excel.EasyExcel;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.qmth.boot.api.exception.ApiException;
 import com.qmth.sop.business.bean.dto.CrmDetailImportDto;
@@ -65,7 +66,7 @@ public class TBCrmDetailServiceImpl extends ServiceImpl<TBCrmDetailMapper, TBCrm
      */
     @Override
     @Transactional
-    public boolean sopVarSave(String crmNo, String processVar)  {
+    public boolean sopVarSave(String crmNo, String processVar) {
         SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
         TBCrm tbCrm = tbCrmService.findByCrmNo(crmNo);
         tbCrm.updateProcessVar(processVar, sysUser.getId());
@@ -153,4 +154,16 @@ public class TBCrmDetailServiceImpl extends ServiceImpl<TBCrmDetailMapper, TBCrm
         log.info("============耗时{}秒============:", (end - start) / 1000);
         return messageMap;
     }
+
+    /**
+     * 查询派单明细sop信息列表
+     *
+     * @param iPage
+     * @param crmNo
+     * @return
+     */
+    @Override
+    public IPage<TBCrmDetail> list(IPage<Map> iPage, String crmNo) {
+        return this.baseMapper.list(iPage, crmNo);
+    }
 }

sop-business/src/main/resources/db/log/wangliang_update_log.sql

@@ -67,5 +67,6 @@ INSERT INTO sys_privilege
 (id, name, url, `type`, parent_id, `sequence`, property, related, enable, default_auth, front_display)
 VALUES(3086, '派单明细sop删除', '/api/admin/tb/crm/detail/sop/delete', 'URL', 3079, 7, 'AUTH', NULL, 1, 1, 0);
 
+-- 2024-05-15
 ALTER TABLE t_b_crm ADD process_var MEDIUMTEXT
     COMMENT '过程变量' NULL after publish_time;

sop-business/src/main/resources/mapper/TBCrmDetailMapper.xml

@@ -2,4 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.qmth.sop.business.mapper.TBCrmDetailMapper">
 
+    <select id="list" resultType="com.qmth.sop.business.entity.TBCrmDetail">
+        select t.* from t_b_crm_detail t where t.crm_no = #{crmNo}
+    </select>
 </mapper>

sop-common/src/main/java/com/qmth/sop/common/enums/ImportTemplateEnum.java

@@ -15,7 +15,9 @@ public enum ImportTemplateEnum {
 
     TEMPLATE_DEVICE("device.xlsx", "设备导入模板.xlsx"),
 
-    TEMPLATE_DELIVERY("delivery.xlsx", "设备发货导入模板.xlsx");
+    TEMPLATE_DELIVERY("delivery.xlsx", "设备发货导入模板.xlsx"),
+
+    TEMPLATE_CRM_SOP_DETAIL("crm_sop_detail.xlsx", "sop导入模板.xlsx");
 
     ImportTemplateEnum(String templateName, String fileName) {
         this.templateName = templateName;