管理后台-修改促销员所属战区、负责人

docker-log.txt

@@ -6,6 +6,8 @@ mvn package -DskipTests
 
 docker stop promotion-service
 
+docker rmi promotion-service
+
 docker rmi
 
 

pom.xml

@@ -13,7 +13,7 @@
     <groupId>com.wangxiaolu</groupId>
     <artifactId>wangxiaolu-promotion-service</artifactId>
 
-    <version>0.1.1</version>
+    <version>0.1.5</version>
 
     <name>wangxiaolu-promotion-service</name>
     <description>promotion-service</description>

src/main/java/com/wangxiaolu/promotion/controller/activity/employee/EmployeeCoreTemporaryInfoController.java

+package com.wangxiaolu.promotion.controller.activity.employee;
+
+import com.wangxiaolu.promotion.exception.ParamException;
+import com.wangxiaolu.promotion.pojo.activity.employee.vo.TemporaryInfoVo;
+import com.wangxiaolu.promotion.pojo.user.dto.WxTemporaryInfoDto;
+import com.wangxiaolu.promotion.result.basedata.R;
+import com.wangxiaolu.promotion.result.basedata.RCode;
+import com.wangxiaolu.promotion.service.activity.employee.EmployeeCoreTemporaryInfoService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Objects;
+
+/**
+ * @author : liqiulin
+ * @date : 2024-07-31 15
+ * @describe :
+ */
+@Slf4j
+@RestController
+@RequestMapping("/activity/employee/core/temporary")
+public class EmployeeCoreTemporaryInfoController {
+
+    @Autowired
+    EmployeeCoreTemporaryInfoService employeeCoreTemporaryInfoService;
+
+    /**
+     * 修改员工详情
+     * @param temporaryInfoVo 修改后的员工信息
+     * @return 是否成功
+     */
+    @PutMapping("/Info")
+    public R updateTemporaryInfoById(@RequestBody TemporaryInfoVo temporaryInfoVo) {
+        if (Objects.isNull(temporaryInfoVo.getId())){
+            throw new ParamException(RCode.DATA_NOT_HAVE_ERROR);
+        }
+        WxTemporaryInfoDto temporaryDto = new WxTemporaryInfoDto();
+        temporaryDto.setId(temporaryInfoVo.getId())
+                .setDeptQcId(temporaryInfoVo.getDeptQcId())
+                .setDeptQcOrgName(temporaryInfoVo.getDeptQcOrgName())
+                .setChargerQcId(temporaryInfoVo.getChargerQcId())
+                .setChargerName(temporaryInfoVo.getChargerName());
+
+        employeeCoreTemporaryInfoService.updateTemporaryInfoById(temporaryDto);
+        return R.success();
+    }
+}

src/main/java/com/wangxiaolu/promotion/domain/user/dao/TemporaryInfoDao.java

@@ -24,4 +24,6 @@ public interface TemporaryInfoDao {
     WxTemporaryInfoDto selectOneById(Integer id);
 
     void findPage(TemporaryWrapper tw, PageInfo pageInfo);
+
+    void updateById(WxTemporaryInfoDto temporaryDto);
 }

src/main/java/com/wangxiaolu/promotion/domain/user/dao/impl/TemporaryInfoDaoImpl.java

@@ -65,6 +65,13 @@ public class TemporaryInfoDaoImpl implements TemporaryInfoDao {
         pageInfo.setRecords(transitionDtos(doPage.getRecords()));
     }
 
+    @Override
+    public void updateById(WxTemporaryInfoDto temporaryDto) {
+        TemporaryInfoDO entity = new TemporaryInfoDO();
+        BeanUtils.copyProperties(temporaryDto, entity);
+        temporaryInfoMapper.updateById(entity);
+    }
+
     private LambdaQueryWrapper<TemporaryInfoDO> buildQueryList(TemporaryWrapper tw) {
         LambdaQueryWrapper<TemporaryInfoDO> queryWrapper = new LambdaQueryWrapper<>();
         if (StringUtils.isNotBlank(tw.getOpenId())) {
@@ -76,6 +83,12 @@ public class TemporaryInfoDaoImpl implements TemporaryInfoDao {
         if (StringUtils.isNotBlank(tw.getChargerQcId())) {
             queryWrapper.eq(TemporaryInfoDO::getChargerQcId, tw.getChargerQcId());
         }
+        if (StringUtils.isNotBlank(tw.getNameLike())) {
+            queryWrapper.like(TemporaryInfoDO::getName, tw.getNameLike());
+        }
+        if (StringUtils.isNotBlank(tw.getDeptQcId())) {
+            queryWrapper.eq(TemporaryInfoDO::getDeptQcId, tw.getDeptQcId());
+        }
         return queryWrapper;
     }
 

src/main/java/com/wangxiaolu/promotion/domain/user/wrapperQo/TemporaryWrapper.java

@@ -27,4 +27,13 @@ public class TemporaryWrapper {
      * 此促销员的任务人-勤策id
      */
     String chargerQcId;
+
+    /**
+     * 按名称模糊查询
+     */
+    String nameLike;
+    /**
+     * 所属战区-部门
+     */
+    String deptQcId;
 }

src/main/java/com/wangxiaolu/promotion/pojo/activity/employee/vo/TemporaryInfoVo.java

+package com.wangxiaolu.promotion.pojo.activity.employee.vo;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+/**
+ * @author : liqiulin
+ * @date : 2024-07-31 15
+ * @describe : 员工详情
+ */
+@AllArgsConstructor
+@NoArgsConstructor
+@Data
+@Accessors(chain = true)
+public class TemporaryInfoVo {
+
+    /**
+     * temporary_info表id
+     */
+    Integer id;
+
+    /**
+     * 所属战区-部门
+     */
+    String deptQcId;
+
+    /**
+     * 所属战区-部门
+     */
+    String deptQcOrgName;
+
+    /**
+     * 此促销员的任务人-勤策id
+     */
+    String chargerQcId;
+
+    /**
+     * 此促销员的任务人姓名
+     */
+    String chargerName;
+}

src/main/java/com/wangxiaolu/promotion/service/activity/employee/EmployeeCoreTemporaryInfoService.java

+package com.wangxiaolu.promotion.service.activity.employee;
+
+import com.wangxiaolu.promotion.pojo.user.dto.WxTemporaryInfoDto;
+
+/**
+ * @author : liqiulin
+ * @date : 2024-07-31 16
+ * @describe :
+ */
+public interface EmployeeCoreTemporaryInfoService {
+    void updateTemporaryInfoById(WxTemporaryInfoDto temporaryDto);
+}

src/main/java/com/wangxiaolu/promotion/service/activity/employee/impl/EmployeeCoreTemporaryInfoServiceImpl.java

+package com.wangxiaolu.promotion.service.activity.employee.impl;
+
+import com.wangxiaolu.promotion.domain.user.dao.TemporaryInfoDao;
+import com.wangxiaolu.promotion.pojo.user.dto.WxTemporaryInfoDto;
+import com.wangxiaolu.promotion.service.activity.employee.EmployeeCoreTemporaryInfoService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author : liqiulin
+ * @date : 2024-07-31 16
+ * @describe :
+ */
+@Service
+public class EmployeeCoreTemporaryInfoServiceImpl implements EmployeeCoreTemporaryInfoService {
+
+    @Autowired
+    TemporaryInfoDao temporaryInfoDao;
+    @Override
+    public void updateTemporaryInfoById(WxTemporaryInfoDto temporaryDto) {
+        temporaryInfoDao.updateById(temporaryDto);
+    }
+}

src/main/java/com/wangxiaolu/promotion/service/activity/temporary/impl/TemporaryActivityQueryServiceImpl.java

@@ -3,7 +3,6 @@ package com.wangxiaolu.promotion.service.activity.temporary.impl;
 import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.fasterxml.uuid.Generators;
 import com.wangxiaolu.promotion.common.redis.RedisKeys;
 import com.wangxiaolu.promotion.common.redis.service.RedisCache;
 import com.wangxiaolu.promotion.domain.activity.dao.TemporaryActivityMarketCellDao;