今正总后台新增

-自动打标签

fs-admin/src/main/java/com/fs/company/controller/CompanySmsTempController.java

@@ -8,7 +8,9 @@ import com.fs.common.core.page.TableDataInfo;
 import com.fs.common.enums.BusinessType;
 import com.fs.common.utils.poi.ExcelUtil;
 import com.fs.company.domain.CompanySmsTemp;
+import com.fs.company.param.CompanySmsTempListQueryParam;
 import com.fs.company.service.ICompanySmsTempService;
+import com.fs.company.vo.CompanySmsTempListQueryVO;
 import com.fs.company.vo.CompanySmsTempListVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -112,4 +114,22 @@ public class CompanySmsTempController extends BaseController
             return R.error("操作失败");
         }
     }
+
+    /**
+     * 总后台取不到companyId，全部展示
+     * @return
+     */
+    @GetMapping("/getSmsTempList")
+    public R getSmsTempList()
+    {
+        CompanySmsTempListQueryParam maps=new CompanySmsTempListQueryParam();
+//        LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
+//        maps.setCompanyId(loginUser.getCompany().getCompanyId());
+        maps.setStatus(1);
+        maps.setIsAudit(1);
+//        List<CompanySmsTempListQueryVO> list = companySmsTempService.selectCompanySmsTempListQuery(maps);
+        List<CompanySmsTempListQueryVO> list = companySmsTempService.selectCompanySmsTempListQueryForAdmin(maps);
+
+        return R.ok().put("data",list);
+    }
 }

fs-admin/src/main/java/com/fs/crm/controller/CrmCustomerController.java

@@ -23,6 +23,8 @@ import com.fs.crm.vo.CrmCustomerListVO;
 import com.fs.framework.web.service.TokenService;
 import com.fs.system.service.ISysRoleService;
 import com.github.pagehelper.PageHelper;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -30,6 +32,7 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.servlet.http.HttpServletRequest;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -324,5 +327,20 @@ public class CrmCustomerController extends BaseController
         return R.ok().put("data",customerList);
     }
 
+    @ApiOperation("获取客户详情")
+    @GetMapping("/getCustomerDetails")
+    @PreAuthorize("@ss.hasPermi('crm:customer:query')")
+    public R getCustomerDetails(
+            HttpServletRequest request,
+            @ApiParam(required = true, name = "customerId", value = "客户ID") @RequestParam(value = "customerId", required = false) Long customerId
+    ){
+        LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
+        CrmCustomer customer=crmCustomerService.selectCrmCustomerById(customerId);
+        Boolean isReceive=false;
+        if(customer.getIsReceive()!=null&&customer.getIsReceive()==1&&customer.getReceiveUserId()!=null&&loginUser.getUser().getUserId().equals(customer.getReceiveUserId())){
+            isReceive=true;
+        }
+        return R.ok().put("customer",customer).put("isReceive",isReceive);
 
+    }
 }

fs-admin/src/main/java/com/fs/qw/controller/QwAutoTagsController.java

@@ -0,0 +1,136 @@
+package com.fs.qw.controller;
+
+
+import ch.qos.logback.core.util.ContextUtil;
+import com.alibaba.fastjson.JSON;
+import com.fs.common.annotation.Log;
+import com.fs.common.core.controller.BaseController;
+import com.fs.common.core.domain.AjaxResult;
+import com.fs.common.core.domain.R;
+import com.fs.common.core.domain.model.LoginUser;
+import com.fs.common.core.page.TableDataInfo;
+import com.fs.common.enums.BusinessType;
+import com.fs.common.utils.ServletUtils;
+import com.fs.common.utils.poi.ExcelUtil;
+//import com.fs.framework.security.LoginUser;
+//import com.fs.framework.service.TokenService;
+import com.fs.qw.domain.QwAutoTags;
+import com.fs.qw.param.QwAutoTagsParam;
+import com.fs.qw.param.QwAutoTagsRulesTags;
+import com.fs.qw.param.QwTagSearchParam;
+import com.fs.qw.service.IQwAutoTagsService;
+import com.fs.qw.service.IQwTagService;
+import com.fs.qw.vo.QwAutoTagsVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.*;
+
+/**
+ * 自动打标签主Controller
+ *
+ * @author fs
+ * @date 2024-07-20
+ */
+@RestController
+@RequestMapping("/qw/autoTags")
+public class QwAutoTagsController extends BaseController
+{
+    @Autowired
+    private IQwAutoTagsService qwAutoTagsService;
+
+//    @Autowired
+//    private TokenService tokenService;
+
+    @Autowired
+    private IQwTagService iQwTagService;
+    /**
+     * 查询自动打标签主列表
+     */
+    @PreAuthorize("@ss.hasPermi('qw:autoTags:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(QwAutoTagsParam qwAutoTags)
+    {
+        startPage();
+        List<QwAutoTagsVO> list = qwAutoTagsService.selectQwAutoTagsListVO(qwAutoTags);
+        list.forEach(item->{
+
+            QwTagSearchParam param = new QwTagSearchParam();
+
+            Set<String> combinedTagsSet = new HashSet<>();
+            List<QwAutoTagsRulesTags> qwAutoTagsRulesTagsList = JSON.parseArray(item.getRulesTags(), QwAutoTagsRulesTags.class);
+            for (QwAutoTagsRulesTags rulesTags : qwAutoTagsRulesTagsList) {
+                List<String> tagsItem = rulesTags.getTags();
+
+                combinedTagsSet.addAll(tagsItem);
+            }
+
+            param.setTagIds(new ArrayList<>(combinedTagsSet));
+            item.setTagIdsName(iQwTagService.selectQwTagListByTagIds(param));
+
+        });
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出自动打标签主列表
+     */
+    @PreAuthorize("@ss.hasPermi('qw:autoTags:export')")
+    @Log(title = "自动打标签主", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(QwAutoTagsParam qwAutoTags)
+    {
+//        LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
+//        qwAutoTags.setCompanyId( loginUser.getCompany().getCompanyId());
+        List<QwAutoTagsVO> list = qwAutoTagsService.selectQwAutoTagsListVO(qwAutoTags);
+        ExcelUtil<QwAutoTagsVO> util = new ExcelUtil<QwAutoTagsVO>(QwAutoTagsVO.class);
+        return util.exportExcel(list, "自动打标签主数据");
+    }
+
+    /**
+     * 获取自动打标签主详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('qw:autoTags:query')")
+    @GetMapping(value = "/{id}")
+    public R getInfo(@PathVariable("id") Long id)
+    {
+        return qwAutoTagsService.selectQwAutoTagsByIdVO(id);
+    }
+
+    /**
+     * 新增自动打标签主
+     */
+    @PreAuthorize("@ss.hasPermi('qw:autoTags:add')")
+    @Log(title = "自动打标签主", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody QwAutoTags qwAutoTags)
+    {
+        LoginUser loginUser = getLoginUser();
+        qwAutoTags.setCreateName(loginUser.getUser().getNickName());
+        qwAutoTags.setCreateTime(new Date());
+        return toAjax(qwAutoTagsService.insertQwAutoTags(qwAutoTags));
+    }
+
+    /**
+     * 修改自动打标签主
+     */
+    @PreAuthorize("@ss.hasPermi('qw:autoTags:edit')")
+    @Log(title = "自动打标签主", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody QwAutoTags qwAutoTags)
+    {
+        return toAjax(qwAutoTagsService.updateQwAutoTags(qwAutoTags));
+    }
+
+    /**
+     * 删除自动打标签主
+     */
+    @PreAuthorize("@ss.hasPermi('qw:autoTags:remove')")
+    @Log(title = "自动打标签主", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(qwAutoTagsService.deleteQwAutoTagsByIds(ids));
+    }
+}

fs-admin/src/main/java/com/fs/qw/controller/QwAutoTagsLogsController.java

@@ -0,0 +1,132 @@
+package com.fs.qw.controller;
+
+import com.fs.common.annotation.Log;
+import com.fs.common.core.controller.BaseController;
+import com.fs.common.core.domain.AjaxResult;
+import com.fs.common.core.page.TableDataInfo;
+import com.fs.common.enums.BusinessType;
+import com.fs.common.utils.ServletUtils;
+import com.fs.common.utils.poi.ExcelUtil;
+//import com.fs.framework.security.LoginUser;
+//import com.fs.framework.service.TokenService;
+import com.fs.qw.domain.QwAutoTagsLogs;
+import com.fs.qw.param.QwAutoTagsLogsParams;
+import com.fs.qw.param.QwTagSearchParam;
+import com.fs.qw.service.IQwAutoTagsLogsService;
+import com.fs.qw.service.IQwTagService;
+import com.fs.qw.vo.QwAutoTagsLogsVO;
+import com.google.gson.Gson;
+import com.google.gson.reflect.TypeToken;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * 自动打标签的日志Controller
+ *
+ * @author fs
+ * @date 2024-07-20
+ */
+@RestController
+@RequestMapping("/qw/autoTagsLogs")
+public class QwAutoTagsLogsController extends BaseController
+{
+    @Autowired
+    private IQwAutoTagsLogsService qwAutoTagsLogsService;
+
+
+//    @Autowired
+//    private TokenService tokenService;
+
+    @Autowired
+    private IQwTagService iQwTagService;
+
+    /**
+     * 查询自动打标签的日志列表
+     */
+    @PreAuthorize("@ss.hasPermi('qw:autoTags:query')")
+    @GetMapping("/list")
+    public TableDataInfo list(QwAutoTagsLogsParams params)
+    {
+        startPage();
+//        LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
+//        params.setCompanyId( loginUser.getCompany().getCompanyId());
+        List<QwAutoTagsLogsVO> list = qwAutoTagsLogsService.selectQwAutoTagsLogsListVO(params);
+        list.forEach(item->{
+
+            if (!Objects.equals(item.getEffectiveRules(), "[]") && item.getEffectiveRules()!=null) {
+                QwTagSearchParam param = new QwTagSearchParam();
+                Gson gson = new Gson();
+                List<String> tagIds = gson.fromJson(
+                        item.getEffectiveRules(),
+                        new TypeToken<List<String>>() {
+                        }.getType()
+                );
+
+                param.setTagIds(tagIds);
+
+                item.setTagIdsName(iQwTagService.selectQwTagListByTagIds(param));
+            }
+        });
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出自动打标签的日志列表
+     */
+    @PreAuthorize("@ss.hasPermi('qw:autoTags:export')")
+    @Log(title = "自动打标签的日志", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(QwAutoTagsLogs qwAutoTagsLogs)
+    {
+        List<QwAutoTagsLogs> list = qwAutoTagsLogsService.selectQwAutoTagsLogsList(qwAutoTagsLogs);
+        ExcelUtil<QwAutoTagsLogs> util = new ExcelUtil<QwAutoTagsLogs>(QwAutoTagsLogs.class);
+        return util.exportExcel(list, "自动打标签的日志数据");
+    }
+
+    /**
+     * 获取自动打标签的日志详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('qw:autoTags:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return AjaxResult.success(qwAutoTagsLogsService.selectQwAutoTagsLogsById(id));
+    }
+
+    /**
+     * 新增自动打标签的日志
+     */
+    @PreAuthorize("@ss.hasPermi('qw:autoTags:add')")
+    @Log(title = "自动打标签的日志", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody QwAutoTagsLogs qwAutoTagsLogs)
+    {
+        return toAjax(qwAutoTagsLogsService.insertQwAutoTagsLogs(qwAutoTagsLogs));
+    }
+
+    /**
+     * 修改自动打标签的日志
+     */
+    @PreAuthorize("@ss.hasPermi('qw:autoTags:edit')")
+    @Log(title = "自动打标签的日志", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody QwAutoTagsLogs qwAutoTagsLogs)
+    {
+        return toAjax(qwAutoTagsLogsService.updateQwAutoTagsLogs(qwAutoTagsLogs));
+    }
+
+    /**
+     * 删除自动打标签的日志
+     */
+    @PreAuthorize("@ss.hasPermi('qw:autoTags:remove')")
+    @Log(title = "自动打标签的日志", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(qwAutoTagsLogsService.deleteQwAutoTagsLogsByIds(ids));
+    }
+}

fs-admin/src/main/java/com/fs/qw/controller/QwGroupMsgController.java

@@ -0,0 +1,160 @@
+package com.fs.qw.controller;
+
+import com.fs.common.annotation.Log;
+import com.fs.common.core.controller.BaseController;
+import com.fs.common.core.domain.AjaxResult;
+import com.fs.common.core.domain.R;
+import com.fs.common.core.page.TableDataInfo;
+import com.fs.common.enums.BusinessType;
+import com.fs.common.utils.poi.ExcelUtil;
+//import com.fs.framework.security.LoginUser;
+//import com.fs.framework.service.TokenService;
+import com.fs.qw.domain.QwGroupMsg;
+import com.fs.qw.param.QwGroupMsgDetailsParam;
+import com.fs.qw.service.IQwGroupMsgService;
+import com.fs.qw.vo.QwGroupMsgDetailsVO;
+import com.fs.qw.vo.QwGroupMsgVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 客户群发记录主Controller
+ *
+ * @author fs
+ * @date 2024-06-20
+ */
+@RestController
+@RequestMapping("/qw/groupMsg")
+public class QwGroupMsgController extends BaseController
+{
+    @Autowired
+    private IQwGroupMsgService qwGroupMsgService;
+
+//    @Autowired
+//    private TokenService tokenService;
+    /**
+     * 查询客户群发记录主列表
+     */
+    @PreAuthorize("@ss.hasPermi('qw:groupMsg:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(QwGroupMsg qwGroupMsg)
+    {
+        startPage();
+//        LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
+//        qwGroupMsg.setCompanyId(loginUser.getCompany().getCompanyId());
+        List<QwGroupMsgVO> list = qwGroupMsgService.selectQwGroupMsgListVO(qwGroupMsg);
+        return getDataTable(list);
+    }
+
+    /**
+     * 查询客户群发记录主列表
+     */
+    @PreAuthorize("@ss.hasPermi('qw:groupMsg:myList')")
+    @GetMapping("/myList")
+    public TableDataInfo myList(QwGroupMsg qwGroupMsg)
+    {
+        startPage();
+//        LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
+//        qwGroupMsg.setCompanyId(loginUser.getCompany().getCompanyId());
+        List<QwGroupMsgVO> list = qwGroupMsgService.selectQwGroupMsgListMyVO(qwGroupMsg);
+        return getDataTable(list);
+    }
+
+
+    /**
+     * 导出客户群发记录主列表
+     */
+    @PreAuthorize("@ss.hasPermi('qw:groupMsg:export')")
+    @Log(title = "客户群发记录主", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(QwGroupMsg qwGroupMsg)
+    {
+        List<QwGroupMsgVO> list = qwGroupMsgService.selectQwGroupMsgListVO(qwGroupMsg);
+        ExcelUtil<QwGroupMsgVO> util = new ExcelUtil<QwGroupMsgVO>(QwGroupMsgVO.class);
+        return util.exportExcel(list, "客户群发记录主数据");
+    }
+
+    /**
+     * 获取客户群发记录主详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('qw:groupMsg:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return AjaxResult.success(qwGroupMsgService.selectQwGroupMsgByIdVO(id));
+    }
+
+//    /**
+//     * 新增客户群发/客户群群发记录
+//     */
+//    @PreAuthorize("@ss.hasPermi('qw:groupMsg:add')")
+//    @Log(title = "客户群发记录", businessType = BusinessType.INSERT)
+//    @PostMapping
+//    public R add(@RequestBody QwGroupMsgParam qwGroupMsgParam) throws Exception {
+//        LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
+////        Long companyId = loginUser.getCompany().getCompanyId();
+//        qwGroupMsgParam.setCreateName(loginUser.getUser().getNickName());
+//        return qwGroupMsgService.insertQwGroupMsg(qwGroupMsgParam);
+//    }
+
+    /** 统计数据详情，已发送，未发送，已接收，未接收等
+     *  groupMsgId 消息主表的主键
+     * */
+    @GetMapping("/getCountGroupMsgUser/{groupMsgId}")
+    public R getCountGroupMsgUser(@PathVariable("groupMsgId") Long groupMsgId){
+
+        return qwGroupMsgService.getCountGroupMsgUser(groupMsgId);
+    }
+
+    /** 统计数据详情，已发送群主，送达群聊，未发送群主，未送达群聊等 */
+    @GetMapping("/getCountGroupMsgBaseUser/{groupMsgId}")
+    public R getCountGroupMsgBaseUser(@PathVariable("groupMsgId") Long groupMsgId){
+
+        return qwGroupMsgService.getCountGroupMsgBaseUser(groupMsgId);
+    }
+
+    /**
+     * 客户群发 发送/接收的数据详情
+     */
+    @GetMapping("/getCountGroupMsgUserDetails")
+    public TableDataInfo getCountGroupMsgUserDetails(QwGroupMsgDetailsParam qwGroupMsgDetailsParam){
+
+        startPage();
+        List<QwGroupMsgDetailsVO> list = qwGroupMsgService.getCountGroupMsgUserDetails(qwGroupMsgDetailsParam);
+        return getDataTable(list);
+    }
+
+    /** 提醒成员群发 */
+    @PreAuthorize("@ss.hasPermi('qw:groupMsg:remindGroupMsg')")
+    @GetMapping("/remindGroupMsg")
+    public R remindGroupMsg(QwGroupMsgDetailsParam qwGroupMsgDetailsParam){
+
+
+        return  qwGroupMsgService.remindGroupMsg(qwGroupMsgDetailsParam);
+    }
+
+//    /**
+//     * 修改客户群发记录主
+//     */
+//    @PreAuthorize("@ss.hasPermi('qw:groupMsg:edit')")
+//    @Log(title = "客户群发记录主", businessType = BusinessType.UPDATE)
+//    @PutMapping
+//    public AjaxResult edit(@RequestBody QwGroupMsg qwGroupMsg)
+//    {
+//        return toAjax(qwGroupMsgService.updateQwGroupMsg(qwGroupMsg));
+//    }
+
+    /**
+     * 删除客户群发记录主
+     */
+    @PreAuthorize("@ss.hasPermi('qw:groupMsg:remove')")
+    @Log(title = "客户群发记录主", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(qwGroupMsgService.deleteQwGroupMsgByIds(ids));
+    }
+}

fs-admin/src/main/java/com/fs/qw/controller/QwGroupMsgUserController.java

@@ -0,0 +1,118 @@
+package com.fs.qw.controller;
+
+import com.fs.common.annotation.Log;
+import com.fs.common.core.controller.BaseController;
+import com.fs.common.core.domain.AjaxResult;
+import com.fs.common.core.domain.R;
+import com.fs.common.core.page.TableDataInfo;
+import com.fs.common.enums.BusinessType;
+import com.fs.common.utils.poi.ExcelUtil;
+//import com.fs.framework.service.TokenService;
+import com.fs.qw.domain.QwGroupMsgUser;
+import com.fs.qw.service.IQwGroupMsgUserService;
+import com.fs.qw.vo.QwGroupMsgDetailsVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 群发成员发送任务及执行结果反馈记录Controller
+ *
+ * @author fs
+ * @date 2024-06-20
+ */
+@RestController
+@RequestMapping("/qw/groupMsgUser")
+public class QwGroupMsgUserController extends BaseController
+{
+    @Autowired
+    private IQwGroupMsgUserService qwGroupMsgUserService;
+
+//    @Autowired
+//    private TokenService tokenService;
+
+    /**
+     * 查询群发成员发送任务及执行结果反馈记录列表
+     */
+    @PreAuthorize("@ss.hasPermi('qw:groupMsgUser:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(QwGroupMsgUser qwGroupMsgUser)
+    {
+        startPage();
+        List<QwGroupMsgUser> list = qwGroupMsgUserService.selectQwGroupMsgUserList(qwGroupMsgUser);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出群发成员发送任务及执行结果反馈记录列表
+     */
+    @PreAuthorize("@ss.hasPermi('qw:groupMsgUser:export')")
+    @Log(title = "群发成员发送任务及执行结果反馈记录", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(QwGroupMsgUser qwGroupMsgUser)
+    {
+        List<QwGroupMsgUser> list = qwGroupMsgUserService.selectQwGroupMsgUserList(qwGroupMsgUser);
+        ExcelUtil<QwGroupMsgUser> util = new ExcelUtil<QwGroupMsgUser>(QwGroupMsgUser.class);
+        return util.exportExcel(list, "群发成员发送任务及执行结果反馈记录数据");
+    }
+
+    /**
+     * 获取群发成员发送任务及执行结果反馈记录详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('qw:groupMsgUser:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return AjaxResult.success(qwGroupMsgUserService.selectQwGroupMsgUserById(id));
+    }
+
+    /**
+     * 新增群发成员发送任务及执行结果反馈记录
+     */
+    @PreAuthorize("@ss.hasPermi('qw:groupMsgUser:add')")
+    @Log(title = "群发成员发送任务及执行结果反馈记录", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody QwGroupMsgUser qwGroupMsgUser)
+    {
+        return toAjax(qwGroupMsgUserService.insertQwGroupMsgUser(qwGroupMsgUser));
+    }
+
+    /**
+     * 修改群发成员发送任务及执行结果反馈记录
+     */
+    @PreAuthorize("@ss.hasPermi('qw:groupMsgUser:edit')")
+    @Log(title = "群发成员发送任务及执行结果反馈记录", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody QwGroupMsgUser qwGroupMsgUser)
+    {
+        return toAjax(qwGroupMsgUserService.updateQwGroupMsgUser(qwGroupMsgUser));
+    }
+
+    /**
+     * 删除群发成员发送任务及执行结果反馈记录
+     */
+    @PreAuthorize("@ss.hasPermi('qw:groupMsgUser:remove')")
+    @Log(title = "群发成员发送任务及执行结果反馈记录", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(qwGroupMsgUserService.deleteQwGroupMsgUserByIds(ids));
+    }
+
+    /** 刷新/同步 客户群群发 结果 */
+    @PostMapping("/refreshResultsGroupMsgUser")
+    public R refreshResultsGroupMsgUser(@RequestBody List<QwGroupMsgDetailsVO> list){
+
+
+        return  qwGroupMsgUserService.refreshResultsGroupMsgUser(list);
+    }
+
+    /** 刷新/同步 客户群发 结果 */
+    @PostMapping("/refreshResultsMsgUser")
+    public R refreshResultsMsgUser(@RequestBody List<QwGroupMsgDetailsVO> list,String corpId){
+        QwGroupMsgDetailsVO qwGroupMsgDetailsVO = list.get(0);
+        return  qwGroupMsgUserService.refreshResultsMsgUser(list,qwGroupMsgDetailsVO.getCorpId() );
+    }
+}

fs-service/src/main/java/com/fs/company/mapper/CompanySmsTempMapper.java

@@ -10,15 +10,15 @@ import org.apache.ibatis.annotations.Select;
 
 /**
  * 短信模板Mapper接口
- * 
+ *
  * @author fs
  * @date 2023-01-09
  */
-public interface CompanySmsTempMapper 
+public interface CompanySmsTempMapper
 {
     /**
      * 查询短信模板
-     * 
+     *
      * @param tempId 短信模板ID
      * @return 短信模板
      */
@@ -26,7 +26,7 @@ public interface CompanySmsTempMapper
 
     /**
      * 查询短信模板列表
-     * 
+     *
      * @param companySmsTemp 短信模板
      * @return 短信模板集合
      */
@@ -34,7 +34,7 @@ public interface CompanySmsTempMapper
 
     /**
      * 新增短信模板
-     * 
+     *
      * @param companySmsTemp 短信模板
      * @return 结果
      */
@@ -42,7 +42,7 @@ public interface CompanySmsTempMapper
 
     /**
      * 修改短信模板
-     * 
+     *
      * @param companySmsTemp 短信模板
      * @return 结果
      */
@@ -50,7 +50,7 @@ public interface CompanySmsTempMapper
 
     /**
      * 删除短信模板
-     * 
+     *
      * @param tempId 短信模板ID
      * @return 结果
      */
@@ -58,7 +58,7 @@ public interface CompanySmsTempMapper
 
     /**
      * 批量删除短信模板
-     * 
+     *
      * @param tempIds 需要删除的数据ID
      * @return 结果
      */
@@ -93,4 +93,17 @@ public interface CompanySmsTempMapper
             "order by t.temp_id desc " +
             "</script>"})
     List<CompanySmsTempListQueryVO> selectCompanySmsTempListQuery(@Param("maps")CompanySmsTempListQueryParam companySmsTemp);
+
+    @Select({"<script> " +
+            "select t.*,c.company_name from company_sms_temp t left join company c on c.company_id=t.company_id " +
+            "where 1=1  " +
+            "<if test = 'maps.status != null  '> " +
+            "and t.status = #{maps.status}" +
+            "</if>" +
+            "<if test = 'maps.isAudit != null  '> " +
+            "and t.is_audit = #{maps.isAudit}" +
+            "</if>" +
+            "order by t.temp_id desc " +
+            "</script>"})
+    List<CompanySmsTempListQueryVO> selectCompanySmsTempListQueryForAdmin(@Param("maps") CompanySmsTempListQueryParam maps);
 }

fs-service/src/main/java/com/fs/company/service/ICompanySmsTempService.java

@@ -8,15 +8,15 @@ import com.fs.company.vo.CompanySmsTempListVO;
 
 /**
  * 短信模板Service接口
- * 
+ *
  * @author fs
  * @date 2023-01-09
  */
-public interface ICompanySmsTempService 
+public interface ICompanySmsTempService
 {
     /**
      * 查询短信模板
-     * 
+     *
      * @param tempId 短信模板ID
      * @return 短信模板
      */
@@ -24,7 +24,7 @@ public interface ICompanySmsTempService
 
     /**
      * 查询短信模板列表
-     * 
+     *
      * @param companySmsTemp 短信模板
      * @return 短信模板集合
      */
@@ -32,7 +32,7 @@ public interface ICompanySmsTempService
 
     /**
      * 新增短信模板
-     * 
+     *
      * @param companySmsTemp 短信模板
      * @return 结果
      */
@@ -40,7 +40,7 @@ public interface ICompanySmsTempService
 
     /**
      * 修改短信模板
-     * 
+     *
      * @param companySmsTemp 短信模板
      * @return 结果
      */
@@ -48,7 +48,7 @@ public interface ICompanySmsTempService
 
     /**
      * 批量删除短信模板
-     * 
+     *
      * @param tempIds 需要删除的短信模板ID
      * @return 结果
      */
@@ -56,7 +56,7 @@ public interface ICompanySmsTempService
 
     /**
      * 删除短信模板信息
-     * 
+     *
      * @param tempId 短信模板ID
      * @return 结果
      */
@@ -67,4 +67,6 @@ public interface ICompanySmsTempService
     List<CompanySmsTempListVO> selectCompanySmsTempListVO(CompanySmsTemp companySmsTemp);
 
     List<CompanySmsTempListQueryVO> selectCompanySmsTempListQuery(CompanySmsTempListQueryParam companySmsTemp);
+
+    List<CompanySmsTempListQueryVO> selectCompanySmsTempListQueryForAdmin(CompanySmsTempListQueryParam maps);
 }

fs-service/src/main/java/com/fs/company/service/impl/CompanySmsTempServiceImpl.java

@@ -13,19 +13,19 @@ import com.fs.company.service.ICompanySmsTempService;
 
 /**
  * 短信模板Service业务层处理
- * 
+ *
  * @author fs
  * @date 2023-01-09
  */
 @Service
-public class CompanySmsTempServiceImpl implements ICompanySmsTempService 
+public class CompanySmsTempServiceImpl implements ICompanySmsTempService
 {
     @Autowired
     private CompanySmsTempMapper companySmsTempMapper;
 
     /**
      * 查询短信模板
-     * 
+     *
      * @param tempId 短信模板ID
      * @return 短信模板
      */
@@ -37,7 +37,7 @@ public class CompanySmsTempServiceImpl implements ICompanySmsTempService
 
     /**
      * 查询短信模板列表
-     * 
+     *
      * @param companySmsTemp 短信模板
      * @return 短信模板
      */
@@ -49,7 +49,7 @@ public class CompanySmsTempServiceImpl implements ICompanySmsTempService
 
     /**
      * 新增短信模板
-     * 
+     *
      * @param companySmsTemp 短信模板
      * @return 结果
      */
@@ -62,7 +62,7 @@ public class CompanySmsTempServiceImpl implements ICompanySmsTempService
 
     /**
      * 修改短信模板
-     * 
+     *
      * @param companySmsTemp 短信模板
      * @return 结果
      */
@@ -75,7 +75,7 @@ public class CompanySmsTempServiceImpl implements ICompanySmsTempService
 
     /**
      * 批量删除短信模板
-     * 
+     *
      * @param tempIds 需要删除的短信模板ID
      * @return 结果
      */
@@ -87,7 +87,7 @@ public class CompanySmsTempServiceImpl implements ICompanySmsTempService
 
     /**
      * 删除短信模板信息
-     * 
+     *
      * @param tempId 短信模板ID
      * @return 结果
      */
@@ -111,4 +111,9 @@ public class CompanySmsTempServiceImpl implements ICompanySmsTempService
     public List<CompanySmsTempListQueryVO> selectCompanySmsTempListQuery(CompanySmsTempListQueryParam companySmsTemp) {
         return companySmsTempMapper.selectCompanySmsTempListQuery(companySmsTemp);
     }
+
+    @Override
+    public List<CompanySmsTempListQueryVO> selectCompanySmsTempListQueryForAdmin(CompanySmsTempListQueryParam maps) {
+        return companySmsTempMapper.selectCompanySmsTempListQueryForAdmin(maps);
+    }
 }