From b394e733dee671a0755d534aafc4bf4c4a971529 Mon Sep 17 00:00:00 2001
From: wangpengfei <1928057482@qq.com>
Date: Wed, 26 Jul 2023 18:07:01 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E6=8E=A8=E9=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../EnterpriseProjectDto.java                 |  3 +++
 .../EnterpriseProjectVo.java                  |  1 +
 .../ProjectInformationVo.java                 |  4 ++++
 .../EnterpriseProjectMapper.java              |  2 ++
 .../EnterpriseProjectMapper.xml               | 12 ++++++++---
 .../EnterpriseProjectService.java             | 21 ++++++++++++-------
 .../ProjectInformationService.java            |  5 ++++-
 .../report/biz/wechat/WechatRest.java         | 21 ++++++++++---------
 8 files changed, 48 insertions(+), 21 deletions(-)

diff --git a/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/enterpriseproject/EnterpriseProjectDto.java b/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/enterpriseproject/EnterpriseProjectDto.java
index 11eb8907..073cb3e2 100644
--- a/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/enterpriseproject/EnterpriseProjectDto.java
+++ b/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/enterpriseproject/EnterpriseProjectDto.java
@@ -4,6 +4,8 @@ import com.yxt.common.core.dto.Dto;
 import io.swagger.annotations.ApiModel;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @author wangpengfei
  * @date 2023/7/24 10:46
@@ -15,4 +17,5 @@ public class EnterpriseProjectDto implements Dto {
     private String sid;
     private String projectSid;
     private String enterpriseSid;
+    private List<String> enterpriseSids;
 }
diff --git a/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/enterpriseproject/EnterpriseProjectVo.java b/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/enterpriseproject/EnterpriseProjectVo.java
index 7fd21fc1..95a6584e 100644
--- a/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/enterpriseproject/EnterpriseProjectVo.java
+++ b/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/enterpriseproject/EnterpriseProjectVo.java
@@ -13,6 +13,7 @@ public class EnterpriseProjectVo implements Vo {
     private String id;
     private String ids;
     private String projectSid;
+    private String enterpriseName;
     private String enterpriseSid;
 
 }
diff --git a/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/projectinformation/ProjectInformationVo.java b/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/projectinformation/ProjectInformationVo.java
index b58e2ee1..a7092e84 100644
--- a/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/projectinformation/ProjectInformationVo.java
+++ b/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/projectinformation/ProjectInformationVo.java
@@ -1,9 +1,12 @@
 package com.yxt.supervise.crm.api.projectinformation;
 
 import com.yxt.common.core.vo.Vo;
+import com.yxt.supervise.crm.api.enterpriseproject.EnterpriseProjectVo;
 import io.swagger.annotations.ApiModel;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @author wangpengfei
  * @date 2023/4/25 9:29
@@ -46,4 +49,5 @@ public class ProjectInformationVo implements Vo {
     private String remarks;
     private String  engaDate;
     private String url;
+    private List<EnterpriseProjectVo> enterpriseProjectVoList;
 }
diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/enterpriseproject/EnterpriseProjectMapper.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/enterpriseproject/EnterpriseProjectMapper.java
index df86d069..17493570 100644
--- a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/enterpriseproject/EnterpriseProjectMapper.java
+++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/enterpriseproject/EnterpriseProjectMapper.java
@@ -20,6 +20,8 @@ import java.util.List;
 public interface EnterpriseProjectMapper extends BaseMapper<EnterpriseProject> {
     IPage<EnterpriseProjectVo> selectPageVo(IPage<EnterpriseProject> page, @Param(Constants.WRAPPER) Wrapper<EnterpriseProject> qw);
     EnterpriseProjectVo getEnterpriseBySid( @Param("sid") String sid);
+    List<EnterpriseProjectVo> getEnterpriseByProjectSid( @Param("sid") String sid);
+
     //查询联系人
     List<BankManagerVo> getBankManager(@Param("sid") String sid);
     //根据sid下级
diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/enterpriseproject/EnterpriseProjectMapper.xml b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/enterpriseproject/EnterpriseProjectMapper.xml
index 9ca20e49..c11bede5 100644
--- a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/enterpriseproject/EnterpriseProjectMapper.xml
+++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/enterpriseproject/EnterpriseProjectMapper.xml
@@ -5,7 +5,7 @@
     <!--    ${ew.customSqlSegment} -->
     <select id="selectPageVo" resultType="com.yxt.supervise.crm.api.enterpriseproject.EnterpriseProjectVo">
         SELECT *
-        FROM enterprise_information
+        FROM enterprise_project
         <where>
             ${ew.sqlSegment}
         </where>
@@ -13,9 +13,15 @@
     <!--根据客户的微信号以及当前登录者所在部门的sid和登录者所关联的员工sid查询-->
     <select id="getEnterpriseBySid" resultType="com.yxt.supervise.crm.api.enterpriseproject.EnterpriseProjectVo">
         SELECT *
-        FROM enterprise_information
+        FROM enterprise_project
         WHERE sid=#{sid}
     </select>
+    <select id="getEnterpriseByProjectSid" resultType="com.yxt.supervise.crm.api.enterpriseproject.EnterpriseProjectVo">
+        SELECT e.*,i.enterpriseName as enterpriseName
+        FROM enterprise_project e left join enterprise_information i on i.sid=e.enterpriseSid
+        WHERE projectSid=#{sid} and enterpriseSid!=(select enterpriseSid from project_information where sid=#{sid})
+    </select>
+    
     <select id="getBankManager" resultType="com.yxt.supervise.crm.api.bankmanager.BankManagerVo">
         SELECT *
         FROM bank_manager
@@ -23,6 +29,6 @@
     </select>
     <select id="EnterpriseList" resultType="com.yxt.supervise.crm.api.enterpriseinformation.EnterpriseInformationVo">
         SELECT *
-        FROM enterprise_information
+        FROM enterprise_project
     </select>
 </mapper>
\ No newline at end of file
diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/enterpriseproject/EnterpriseProjectService.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/enterpriseproject/EnterpriseProjectService.java
index 3b332045..b7f0b397 100644
--- a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/enterpriseproject/EnterpriseProjectService.java
+++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/enterpriseproject/EnterpriseProjectService.java
@@ -40,19 +40,26 @@ public class EnterpriseProjectService extends MybatisBaseService<EnterpriseProje
     }
     public ResultBean save(EnterpriseProjectDto dto) {
         ResultBean rb=new ResultBean();
-        EnterpriseProject entity=new EnterpriseProject();
-        BeanUtil.copyProperties(dto, entity, "id", "sid");
-        baseMapper.insert(entity);
+        for(String sid:dto.getEnterpriseSids()){
+            EnterpriseProject entity=new EnterpriseProject();
+            BeanUtil.copyProperties(dto, entity, "id", "sid");
+            entity.setEnterpriseSid(sid);
+            baseMapper.insert(entity);
+        }
         return rb.success().setMsg("保存企业信息成功");
     }
     public ResultBean update(EnterpriseProjectDto dto) {
         ResultBean rb=new ResultBean();
-        String dtoSid = dto.getSid();
-        EnterpriseProject entity=fetchBySid(dtoSid);
-        BeanUtil.copyProperties(dto, entity, "id", "sid");
-        baseMapper.updateById(entity);
+        //直接删除关联信息重新添加
+        baseMapper.delete(new QueryWrapper<EnterpriseProject>().eq("projectSid",dto.getProjectSid()));
+        this.save(dto);
         return rb.success().setMsg("修改企业信息成功");
     }
+    public List<EnterpriseProjectVo> getEnterpriseByProjectSid(String sid){
+        //根据sid查询的企业
+        List<EnterpriseProjectVo> bank=baseMapper.getEnterpriseByProjectSid(sid);
+        return bank;
+    }
     public EnterpriseProjectVo getEnterpriseBySid(String sid){
         //根据sid查询的企业
         EnterpriseProjectVo bank=baseMapper.getEnterpriseBySid(sid);
diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationService.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationService.java
index 13faf36e..49e65303 100644
--- a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationService.java
+++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationService.java
@@ -9,6 +9,7 @@ import com.yxt.common.base.utils.StringUtils;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
+import com.yxt.supervise.crm.api.enterpriseproject.EnterpriseProjectVo;
 import com.yxt.supervise.crm.api.projectinformation.ProjectInformation;
 import com.yxt.supervise.crm.api.projectinformation.ProjectInformationDto;
 import com.yxt.supervise.crm.api.projectinformation.ProjectInformationQuery;
@@ -84,12 +85,14 @@ public class ProjectInformationService extends MybatisBaseService<ProjectInforma
         dto.getStoreHouseProjectDto().setProjectSid(entity.getSid());
         storeHouseProjectFeign.saveOrUpdateDto(dto.getStoreHouseProjectDto());
         //绑定企业
-        enterpriseProjectService.save(dto.getEnterpriseProjectDto());
+        enterpriseProjectService.update(dto.getEnterpriseProjectDto());
         baseMapper.updateById(entity);
         return rb.success().setMsg("修改项目信息成功");
     }
     public ProjectInformationVo getProjectBySid(String sid){
         ProjectInformationVo bank=baseMapper.getProjectBySid(sid);
+        List<EnterpriseProjectVo> enterpriseProjectVoList=enterpriseProjectService.getEnterpriseByProjectSid(sid);
+        bank.setEnterpriseProjectVoList(enterpriseProjectVoList);
         return bank;
     }
     public List<ProjectInformationVo> getProjectByUserSid(String sid){
diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/wechat/WechatRest.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/wechat/WechatRest.java
index b47f5f8f..5aa59774 100644
--- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/wechat/WechatRest.java
+++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/wechat/WechatRest.java
@@ -145,21 +145,22 @@ public class WechatRest {
         // 模板参数
         Map<String, Template> sendMag = new HashMap<String, Template>();
         // 公众号的模板id(也有相应的接口可以查询到)
-        String templateId = "Zu4eXonKeUGuNuN9D3NKIEHU7PfqPA3uBfrc-lV0kIs";
+//        String templateId = "Zu4eXonKeUGuNuN9D3NKIEHU7PfqPA3uBfrc-lV0kIs";
+        String templateId = "BT6BHEojCmgWNTcpz1raHNIpJEEISP1E134btP51p_8";
         //微信的基础accessToken
-        String accessToken=getAccessToken(APP_ID,APPSECRET);
+        String accessToken=getAccessToken(APP_ID_BIZ,APPSECRETBIZ);
         String wxUrl = WX_URL_MESSAGE_SEND.replace("ACCESS_TOKEN", accessToken);
         List<String> openIds=new ArrayList<>();
-        openIds.add("otnrM57kui-WCUmRtChhb1HguOgw");
-        openIds.add("otnrM544hxIgkMOfaDU8VpJhj_6k");
-        openIds.add("otnrM5ySvUo7ZZc4qafWzM9eyKBk");
-        openIds.add("otnrM521f8KcCsRfL2Jj4Tk8np1g");
-//        openIds.add("oGdho668Hew45t0xfBJC84TNGVzI");
+        openIds.add("oGdho60xVtWEXUks7nYEAn0tGlDE");
+        openIds.add("oGdho66394A-4-NyumcJ1MEaT8Lo");
+        openIds.add("oGdho68CArVhC_-7ELkG-jX21ruk");
+        openIds.add("oGdho6yYB47f52HVk2NqirrFbRRk");
+        openIds.add("oGdho6-12-ioAKeLhVUDYPucbDb4");
         JSONObject jsonObject=new JSONObject();
         for(String openId:openIds){
-            sendMag.put("character_string2", new Template(csmCashReportVo.getSerialNumber()));
-            sendMag.put("thing5", new Template(csmCashReportVo.getReportTime()));
-            sendMag.put("amount3", new Template(String.valueOf(csmCashReportVo.getCountAmount())));
+            sendMag.put("time1", new Template(csmCashReportVo.getReportTime()));
+            sendMag.put("thing2", new Template("36524质物库存汇总"));
+            sendMag.put("thing3", new Template("赵丽晓"));
             Map<String, String> miniprogram = new HashMap<>();
             miniprogram.put("appid","wx11565021714ba796");
             miniprogram.put("pagepath","pages/index/inventoryReport?orderDate="+csmCashReportVo.getOrderDate());