10/9

yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/projecttemplate/ProjectTemplate.java

@@ -13,7 +13,7 @@ import lombok.Data;
 @TableName("project_template")
 public class ProjectTemplate {
     private String id;
-    private String ids;
+    private String sid;
     private String userProjectSid;//用户项目关联sid
     private String templateSid;//微信模版消息sid
 }

yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/templatemessage/TemplateMessageVo.java

@@ -10,7 +10,9 @@ import lombok.Data;
 @Data
 public class TemplateMessageVo implements Vo {
     private String id;
-    private String ids;
+    private String sid;
     private String typeSid;
     private String name;//
+    //1 未选中  2选中
+    private String state;
 }

yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/templatemessagetype/TemplateMessageTypeVo.java

@@ -1,8 +1,11 @@
 package com.yxt.supervise.crm.api.templatemessagetype;
 
 import com.yxt.common.core.vo.Vo;
+import com.yxt.supervise.crm.api.templatemessage.TemplateMessageVo;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @author wangpengfei
  * @date 2023/9/27 15:46
@@ -12,4 +15,8 @@ public class TemplateMessageTypeVo implements Vo {
     private String id;
     private String sid;
     private String name;//
+    private List<TemplateMessageVo> list;
+    //1 未选中  2选中
+
+    private String state;
 }

yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projecttemplate/ProjectTemplateMapper.java

@@ -31,4 +31,6 @@ public interface ProjectTemplateMapper extends BaseMapper<ProjectTemplate> {
     List<ProjectTemplateVo> getProjectByUser( @Param("sid") String sid);
     void insertFiles(List<Map<String, String>> maps);
     List<ProjectTemplateVo> getProjectListByUserSid(@Param("userSid") String userSid);
+    @Select("select templateSid from project_template where userProjectSid=#{sid}")
+    List<String> getTempSidByProjectSid(@Param("sid") String sid);
 }

yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projecttemplate/ProjectTemplateService.java

@@ -61,9 +61,12 @@ public class ProjectTemplateService extends MybatisBaseService<ProjectTemplateMa
     @Transactional
     public ResultBean save(ProjectTemplateDto dto) {
         ResultBean rb=new ResultBean();
-        ProjectTemplate entity=new ProjectTemplate();
+        baseMapper.delete(new QueryWrapper<ProjectTemplate>().eq("userProjectSid",dto.getUserProjectSid()));
+
         for(String template:dto.getTemplateSid()){
+            ProjectTemplate entity=new ProjectTemplate();
             BeanUtil.copyProperties(dto, entity, "id", "sid");
+            entity.setSid(UUID.randomUUID().toString());
             entity.setTemplateSid(template);
             baseMapper.insert(entity);
         }

yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/templatemessage/TemplateMessageMapper.java

@@ -29,4 +29,5 @@ public interface TemplateMessageMapper extends BaseMapper<TemplateMessage> {
     void insertFiles(List<Map<String, String>> maps);
 
     List<TemplateMessageVo> getProjectListByUserSid(@Param("userSid") String userSid);
+    List<String > getListByUserSid(@Param("userSid") String userSid);
 }

yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/templatemessage/TemplateMessageRest.java

@@ -7,6 +7,7 @@ import com.yxt.common.core.vo.PagerVo;
 import com.yxt.supervise.crm.api.templatemessage.TemplateMessageDto;
 import com.yxt.supervise.crm.api.templatemessage.TemplateMessageQuery;
 import com.yxt.supervise.crm.api.templatemessage.TemplateMessageVo;
+import com.yxt.supervise.crm.api.templatemessagetype.TemplateMessageTypeVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -33,10 +34,10 @@ public class TemplateMessageRest {
         PagerVo<TemplateMessageVo> pv = TemplateMessageService.listPageVo(pq);
         return rb.success().setData(pv);
     }
-    @PostMapping("/listAll")
-    public ResultBean listPage() {
+    @GetMapping("/listAll/{sid}")
+    public ResultBean listPage(@PathVariable("sid")String sid) {
         ResultBean rb = ResultBean.fireFail();
-        Map<String,Object> pv = TemplateMessageService.listAll();
+        List<TemplateMessageTypeVo> pv = TemplateMessageService.listAll(sid);
         return rb.success().setData(pv);
     }
 

yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/templatemessage/TemplateMessageService.java

@@ -15,8 +15,10 @@ import com.yxt.supervise.crm.api.templatemessage.TemplateMessageQuery;
 import com.yxt.supervise.crm.api.templatemessage.TemplateMessageVo;
 import com.yxt.supervise.crm.api.templatemessagetype.TemplateMessageType;
 import com.yxt.supervise.crm.api.templatemessagetype.TemplateMessageTypeVo;
+import com.yxt.supervise.crm.biz.projecttemplate.ProjectTemplateMapper;
 import com.yxt.supervise.crm.biz.templatemessagetype.TemplateMessageTypeRest;
 import com.yxt.supervise.crm.biz.templatemessagetype.TemplateMessageTypeService;
+import com.yxt.supervise.crm.biz.userproject.UserProjectMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -31,6 +33,8 @@ import java.util.Map;
  */
 @Service
 public class TemplateMessageService extends MybatisBaseService<TemplateMessageMapper, TemplateMessage> {
+    @Autowired
+    ProjectTemplateMapper projectTemplateMapper;
     @Autowired
     TemplateMessageTypeService templateMessageTypeService;
     public PagerVo<TemplateMessageVo> listPageVo(PagerQuery<TemplateMessageQuery> pq) {
@@ -50,15 +54,28 @@ public class TemplateMessageService extends MybatisBaseService<TemplateMessageMa
         PagerVo<TemplateMessageVo> p = PagerUtil.pageToVo(pagging, null);
         return p;
     }
-    public Map<String,Object> listAll() {
-        Map<String,Object>map=new HashMap<>();
+    public List<TemplateMessageTypeVo> listAll(String sid) {
         List<TemplateMessageTypeVo>list=templateMessageTypeService.listAll();
         for(TemplateMessageTypeVo templateMessageTypeVo:list){
             List<TemplateMessageVo> pagging = baseMapper.listAll(templateMessageTypeVo.getSid());
-            map.put(templateMessageTypeVo.getName(),pagging);
+            List<String> list1=projectTemplateMapper.getTempSidByProjectSid(sid);
+            int i=0;
+            for(String s :list1){
+                for(TemplateMessageVo t:pagging){
+                    if(s.equals(t.getSid())){
+                        t.setState("2");
+                        i++;
+                    }else{
+                        t.setState("1");
+                    }
+                }
+            }
+            if(i==pagging.size()){
+                templateMessageTypeVo.setState("2");
+            }
+            templateMessageTypeVo.setList(pagging);
         }
-
-        return map;
+        return list;
     }
     @Transactional
     public ResultBean save(TemplateMessageDto dto) {

yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/templatemessagetype/TemplateMessageTypeMapper.java

@@ -20,7 +20,7 @@ import java.util.Map;
 @Mapper
 public interface TemplateMessageTypeMapper extends BaseMapper<TemplateMessageType> {
     IPage<TemplateMessageTypeVo> selectPageVo(IPage<TemplateMessageType> page, @Param(Constants.WRAPPER) Wrapper<TemplateMessageType> qw);
-    @Select("select * from project_information")
+    @Select("select * from template_message_type")
     List<TemplateMessageTypeVo> listAll();
     List<TemplateMessageTypeVo> getProjectBySid( @Param("sid") String sid);
     @Select("select p.*,i.enterpriseName as enterpriseName from project_information p left join enterprise_project e on e.projectSid=p.sid left join enterprise_information i on i.sid=e.enterpriseSid left join user_project u on u.projectSid =p.sid where u.userSid=#{sid}")

yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/userproject/UserProjectMapper.java

@@ -20,6 +20,7 @@ public interface UserProjectMapper extends BaseMapper<UserProject> {
     IPage<UserProjectVo> selectPageVo(IPage<UserProject> page, @Param(Constants.WRAPPER) Wrapper<UserProject> qw);
     List<UserProjectVo> userProjectList();
     List<UserProjectVo> getUserProjectBySid( @Param("projectSid") String projectSid);
-    List<String> getUsersByprojectSid( @Param("projectSid") String projectSid);
+    List<String> getUsersByProjectSid( @Param("projectSid") String projectSid);
+
 
 }

yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/userproject/UserProjectMapper.xml

@@ -19,7 +19,7 @@
     <select id="getUserProjectBySid" resultType="com.yxt.supervise.crm.api.userproject.UserProjectVo">
         SELECT * FROM user_project WHERE projectSid=#{projectSid}
     </select>
-    <select id="getUsersByprojectSid" resultType="com.yxt.supervise.crm.api.userproject.UserProjectVo">
+    <select id="getUsersByProjectSid" resultType="string">
         SELECT userSid FROM user_project WHERE projectSid=#{projectSid}
     </select>
 </mapper>

yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/userproject/UserProjectRest.java

@@ -84,8 +84,14 @@ public class UserProjectRest {
     @GetMapping("/getUsersByprojectSid")
     public ResultBean<List<String>> getUsersByprojectSid(@RequestParam("projectSid") String projectSid){
         ResultBean rb = ResultBean.fireFail();
-        return UserProjectService.getUsersByprojectSid(projectSid);
+        return UserProjectService.getUsersByProjectSid(projectSid);
     }
+//    @ApiOperation("根据项目sid查询")
+//    @GetMapping("/getAllByProjectSid")
+//    public ResultBean getAllByProjectSid(@RequestParam("projectSid") String projectSid){
+//        ResultBean rb = ResultBean.fireFail();
+//        return UserProjectService.getAllByProjectSid(projectSid);
+//    }
     @ApiOperation("查询组织结构下人员信息")
     @GetMapping("/userList")
     public ResultBean<List<SysOrganizationVo>> userList(){

yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/userproject/UserProjectService.java

@@ -88,6 +88,7 @@ public class UserProjectService extends MybatisBaseService<UserProjectMapper, Us
            List<SysUserVo>list= sysUserFeign.getUserOrgBySid(userProjectVo.getUserSid()).getData();
            if(list.size()>0){
                userProjectVo.setOrgName(list.get(0).getOrganizationName());
+               userProjectVo.setName(list.get(0).getName());
                if(StrUtil.isNotEmpty(list.get(0).getOpenid())){
                    userProjectVo.setIsOpenId("2");
                }else{
@@ -97,12 +98,16 @@ public class UserProjectService extends MybatisBaseService<UserProjectMapper, Us
         }
         return rb.success().setData(banks);
     }
-    public ResultBean<List<String>> getUsersByprojectSid(String projectSid){
+    public ResultBean<List<String>> getUsersByProjectSid(String projectSid){
         ResultBean rb=new ResultBean();
-        List<String> banks=baseMapper.getUsersByprojectSid(projectSid);
+        List<String> banks=baseMapper.getUsersByProjectSid(projectSid);
         return rb.success().setData(banks);
     }
-
+//    public ResultBean<List<String>> getAllByProjectSid(String projectSid){
+//        ResultBean rb=new ResultBean();
+//        List<String> banks=baseMapper.getAllByProjectSid(projectSid);
+//        return rb.success().setData(banks);
+//    }
     public ResultBean delete(String sid) {
         ResultBean rb=new ResultBean();
         baseMapper.delete(new QueryWrapper<UserProject>().eq("sid",sid));