Merge remote-tracking branch 'origin/dev_v1.0.0' into dev_v1.0.0

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

@@ -155,21 +155,21 @@ public class TBDingController {
     }
 
 
-//    @ApiOperation(value = "考勤明细统计接口")
-//    @RequestMapping(value = "/attendance/count", method = RequestMethod.POST)
-//    @ApiResponses({@ApiResponse(code = 200, message = "考勤明细统计结果", response = TBDingAttendanceCountResult.class)})
-//    public Result attendanceCount(@ApiParam(value = "服务单元", required = false) @RequestParam(required = false) Long serviceId,
-//                                  @ApiParam(value = "姓名（模糊查询）", required = false) @RequestParam(required = false) String userName,
-//                                  @ApiParam(value = "考勤日期开始", required = false) @RequestParam(required = false) Long startTime,
-//                                  @ApiParam(value = "考勤日期结束", required = false) @RequestParam(required = false) Long endTime,
-//                                  @ApiParam(value = "供应商", required = false) @RequestParam(required = false) Long supplierId,
-//                                  @ApiParam(value = "客户名称（模糊查询）", required = false) @RequestParam(required = false) String custom,
-//                                  @ApiParam(value = "SOP流水号（模糊查询）", required = false) @RequestParam(required = false) String sopNo
-//    ) {
-//        TBDingAttendanceCountResult result = tBDingService.attendanceCount(serviceId, userName, startTime, endTime, supplierId, custom, sopNo);
-//
-//        return ResultUtil.ok(result);
-//    }
+    @ApiOperation(value = "考勤明细统计接口")
+    @RequestMapping(value = "/attendance/count", method = RequestMethod.POST)
+    @ApiResponses({@ApiResponse(code = 200, message = "考勤明细统计结果", response = TBDingAttendanceCountResult.class)})
+    public Result attendanceCount(@ApiParam(value = "服务单元", required = false) @RequestParam(required = false) Long serviceId,
+                                  @ApiParam(value = "姓名（模糊查询）", required = false) @RequestParam(required = false) String userName,
+                                  @ApiParam(value = "考勤日期开始", required = false) @RequestParam(required = false) Long startTime,
+                                  @ApiParam(value = "考勤日期结束", required = false) @RequestParam(required = false) Long endTime,
+                                  @ApiParam(value = "供应商", required = false) @RequestParam(required = false) Long supplierId,
+                                  @ApiParam(value = "客户名称（模糊查询）", required = false) @RequestParam(required = false) String custom,
+                                  @ApiParam(value = "SOP流水号（模糊查询）", required = false) @RequestParam(required = false) String sopNo
+    ) {
+        TBDingAttendanceCountResult result = tBDingService.attendanceCount(serviceId, userName, startTime, endTime, supplierId, custom, sopNo);
+
+        return ResultUtil.ok(result);
+    }
 
 
 //    @ApiOperation(value = "考勤明细导出")

sop-business/src/main/java/com/qmth/sop/business/entity/SysCustom.java

@@ -48,10 +48,6 @@ public class SysCustom extends BaseEntity implements Serializable {
     @ApiModelProperty(value = "地址")
     private String address;
 
-    @ApiModelProperty(value = "客户经理id")
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long managerId;
-
     @ApiModelProperty(value = "档位id")
     @JsonSerialize(using = ToStringSerializer.class)
     private Long levelId;
@@ -123,14 +119,6 @@ public class SysCustom extends BaseEntity implements Serializable {
         this.address = address;
     }
 
-    public Long getManagerId() {
-        return managerId;
-    }
-
-    public void setManagerId(Long managerId) {
-        this.managerId = managerId;
-    }
-
     public Long getLevelId() {
         return levelId;
     }

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

@@ -261,7 +261,6 @@ public class TaskLogicServiceImpl implements TaskLogicService {
                     if (Objects.isNull(sysUser)) {
                         throw ExceptionResultEnum.ERROR.exception("客户经理不存在！");
                     }
-                    sysCustom.setManagerId(sysUser.getId());
                     SysLevel sysLevel = sysLevelService.getOne(new QueryWrapper<SysLevel>().lambda().eq(SysLevel::getLevel, e.getLevel()).eq(SysLevel::getType, type));
                     if (Objects.isNull(sysLevel)) {
                         throw ExceptionResultEnum.ERROR.exception("服务档位不存在！");

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

@@ -358,3 +358,5 @@ ALTER TABLE t_b_service_region
 ALTER TABLE t_b_service_region
     ADD UNIQUE INDEX service_region_UN (service_id ASC, region_name ASC) VISIBLE;
 ;
+-- 2023-11-08
+ALTER TABLE `sys_custom` DROP COLUMN `manager_id`;

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

@@ -44,7 +44,7 @@
         tbsi.sop_no as sopNo,
         tbsi.crm_no as crmNo,
         tbc.begin_time as beginTime,
-        cast(sc.manager_id as char) as customManagerId,
+        cast(tbc.crm_user_id as char) as customManagerId,
         su1.real_name as customManagerName,
         sc.type as customManagerType,
         IF(sc.type = 'OFFICE','教务处','研究生') as customManagerTypeStr,
@@ -76,7 +76,7 @@
         left join t_b_service tbs on tbs.id = tbsi.service_id
         left join t_b_service_region r on tbsi.service_id=r.service_id
         left join sys_custom sc on sc.id = tbsi.custom_id
-        left join sys_user su1 on su1.id = sc.manager_id
+        left join sys_user su1 on su1.id = tbc.crm_user_id
         left join t_b_product tbp on tbp.id = tbc.product_id
         left join t_f_custom_flow_entity tfcfe on tfcfe.code = tbsi.sop_no
         left join sys_user su2 on su2.id = tfcfe.create_id

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

@@ -3,17 +3,13 @@
 <mapper namespace="com.qmth.sop.business.mapper.SysCustomMapper">
 
     <select id="query" resultType="com.qmth.sop.business.bean.result.SysCustomResult">
-        select a.*,su.real_name as createName,ma.real_name as managerName,l.level from sys_custom a
+        select a.*,su.real_name as createName,l.level from sys_custom a
         left join sys_user su on su.id = a.create_id
-        left join sys_user ma on ma.id = a.manager_id
         left join sys_level l on l.id = a.level_id
         <where>
             <if test="type != null and type != ''">
                 and a.type = #{type}
             </if>
-            <if test="managerId != null and managerId != ''">
-                and a.manager_id = #{managerId}
-            </if>
             <if test="name != null and name != ''">
                 and a.name like concat('%', #{name} , '%')
             </if>

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

@@ -18,7 +18,8 @@
         FROM
         sys_message m
         LEFT JOIN sys_user u ON u.id = m.receive_user_id
-        LEFT JOIN sys_custom c ON c.manager_id = u.id
+        left join t_b_crm crm on crm.crm_no=m.crm_no
+        LEFT JOIN sys_custom c ON c.id = crm.custom_id
         LEFT JOIN t_b_user_archives ua ON u.mobile_number = ua.mobile_number
         LEFT JOIN sys_supplier s ON s.id = m.supplier_id
         LEFT JOIN t_b_service bs ON bs.id = m.service_id

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

@@ -282,7 +282,7 @@
                 LEFT JOIN
             sys_user regionCoordinator ON tbc.region_coordinator_id = regionCoordinator.id
                 LEFT JOIN
-            sys_user customManager ON sc.manager_id = customManager.id
+            sys_user customManager ON tbc.crm_user_id = customManager.id
         <where>
             <if test="sopNo != null and sopNo != ''">
                 AND tfcfe.code = #{sopNo}
@@ -323,7 +323,7 @@
                 LEFT JOIN
             sys_user regionCoordinator ON tbc.region_coordinator_id = regionCoordinator.id
                 LEFT JOIN
-            sys_user customManager ON sc.manager_id = customManager.id
+            sys_user customManager ON tbc.crm_user_id = customManager.id
         <where>
             <if test="crmNo != null and crmNo != ''">
                 AND tbc.crm_no = #{crmNo}

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

@@ -48,7 +48,7 @@
                tbsi.sop_no as sopNo,
                tbsi.crm_no as crmNo,
                tbc.begin_time as beginTime,
-               cast(sc.manager_id as char) as customManagerId,
+               cast(su1.id as char) as customManagerId,
                su1.real_name as customManagerName,
                sc.type as customManagerType,
                IF(sc.type = 'OFFICE','教务处','研究生') as customManagerTypeStr,
@@ -85,7 +85,7 @@
                  left join t_b_crm tbc on tbc.crm_no = tbsi.crm_no
                  left join t_b_service tbs on tbs.id = tbsi.service_id
                  left join sys_custom sc on sc.id = tbsi.custom_id
-                 left join sys_user su1 on su1.id = sc.manager_id
+                 left join sys_user su1 on su1.id = tbc.crm_user_id
                  left join t_b_product tbp on tbp.id = tbc.product_id
                  left join t_f_custom_flow_entity tfcfe on tfcfe.code = tbsi.sop_no
                  left join sys_user su2 on su2.id = tfcfe.create_id