Merge remote-tracking branch 'origin/master'

ruoyi-admin/src/main/java/com/ruoyi/web/controller/projectV2/common/SendSmsConfigController.java

@@ -86,7 +86,7 @@ public class SendSmsConfigController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('projectV2:config:edit')")
     @Log(title = "短信人员配置", businessType = BusinessType.UPDATE)
-    @PutMapping
+    @PostMapping("/put")
     public AjaxResult edit(@RequestBody SendSmsConfig sendSmsConfig)
     {
         return toAjax(sendSmsConfigService.updateSendSmsConfig(sendSmsConfig));
@@ -97,7 +97,7 @@ public class SendSmsConfigController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('projectV2:config:remove')")
     @Log(title = "短信人员配置", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{ids}")
+	@GetMapping("/delete/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)
     {
         return toAjax(sendSmsConfigService.deleteSendSmsConfigByIds(ids));

ruoyi-common/src/main/java/com/ruoyi/common/utils/jPush/JPushToolUtil.java

@@ -29,7 +29,8 @@ public class JPushToolUtil extends AbstractJPushToolUtil {
         String msgTitle = "推送测试-内容标题" + num;
         String msgContent = "我是内容" + num;
         String jPushVO = "我是扩展的json" + num;
-        boolean b = JPushToolUtil.sendToRegistrationId(notificationTitle, msgTitle, msgContent, jPushVO, "1104a897924659ab708");
+        String[]  registrationId = {"1104a897924659ab708","120c83f760cc7e16c53"};
+        boolean b = JPushToolUtil.sendToRegistrationId(notificationTitle, msgTitle, msgContent, jPushVO, registrationId);
         System.out.println("i="+b);
     }*/
 }

ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/Task.java

@@ -6,6 +6,7 @@ import com.ruoyi.common.core.domain.entity.SysDept;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.jPush.JPushToolUtil;
 import com.ruoyi.framework.manager.AsyncManager;
 import com.ruoyi.framework.manager.factory.AsyncFactory;
 import com.ruoyi.system.domain.SysHoliday;
@@ -72,7 +73,7 @@ public class Task {
      * */
     @Async
     //@Scheduled(cron = "0 0/2 * * * ? ")
-    @Scheduled(cron = "0 1 0 * * ? ")
+    //@Scheduled(cron = "0 1 0 * * ? ")
     public void generateDb() throws Exception {
 
         //查询当前年的借鉴日信息
@@ -378,6 +379,15 @@ public class Task {
             //发送短信
             List<SysUser> sysUsers = sysUserService.selectUserByDeptId(dbd.getDeptId());
             if (sysUsers != null) {
+                //发极光推送
+                String notificationTitle = "消息通知";
+                String msgTitle = "督办";
+                String msgContent = "您有一条督办信息，请及时处理！";
+                String jPushVO = "";
+                List<String> listS = sysUsers.stream().map(SysUser::getJgId).collect(Collectors.toList());
+                String[]  registrationId = (String[]) listS.toArray();
+                JPushToolUtil.sendToRegistrationId(notificationTitle,msgTitle,msgContent,jPushVO,registrationId);
+
                 for (SysUser sysUser : sysUsers) {
                     if (StringUtils.isNotEmpty(sysUser.getPhonenumber())) {
                         SendSmsConfig sendSmsConfig = new SendSmsConfig();
@@ -855,6 +865,16 @@ public class Task {
                 List<SendSmsConfig> sendSmsConfigs = new ArrayList<>();
                 List<SysUser> sysUsers = sysUserService.selectUserByDeptId(sbbzb.getCjdId());
                 if (sysUsers != null) {
+
+                    //发极光推送
+                    String notificationTitle = "消息通知";
+                    String msgTitle = "督办";
+                    String msgContent = "您有一条督办信息，请及时处理！";
+                    String jPushVO = "";
+                    List<String> listS = sysUsers.stream().map(SysUser::getJgId).collect(Collectors.toList());
+                    String[]  registrationId = (String[]) listS.toArray();
+                    JPushToolUtil.sendToRegistrationId(notificationTitle,msgTitle,msgContent,jPushVO,registrationId);
+
                     for (SysUser sysUser : sysUsers) {
                         if (StringUtils.isNotEmpty(sysUser.getPhonenumber())) {
                             SendSmsConfig sendSmsConfig = new SendSmsConfig();

ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/projectV2/ZsyzKgxxServiceImpl.java

@@ -1,8 +1,10 @@
 package com.ruoyi.framework.web.service.projectV2;
 
 import com.ruoyi.common.core.domain.entity.SysDept;
+import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.jPush.JPushToolUtil;
 import com.ruoyi.framework.manager.AsyncManager;
 import com.ruoyi.framework.manager.factory.AsyncFactory;
 import com.ruoyi.system.domain.projectV2.*;
@@ -11,6 +13,7 @@ import com.ruoyi.system.mapper.projectV2.ZsyzFjMapper;
 import com.ruoyi.system.mapper.projectV2.ZsyzKgxxMapper;
 import com.ruoyi.system.mapper.projectV2.ZsyzLcjlMapper;
 import com.ruoyi.system.mapper.projectV2.ZsyzSbbzbMapper;
+import com.ruoyi.system.service.ISysUserService;
 import com.ruoyi.system.service.projectV2.IZsyzKgxxService;
 import com.ruoyi.system.service.projectV2.common.ISendSmsConfigService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -18,6 +21,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
+import java.util.stream.Collectors;
 
 import static com.ruoyi.common.constant.CommonConstants.*;
 
@@ -44,6 +48,9 @@ public class ZsyzKgxxServiceImpl implements IZsyzKgxxService {
     @Autowired
     private ISendSmsConfigService sendSmsConfigService;
 
+    @Autowired
+    private ISysUserService sysUserService;
+
     /**
      * 查询招商引资_开工信息
      *
@@ -127,6 +134,18 @@ public class ZsyzKgxxServiceImpl implements IZsyzKgxxService {
         if (sendSmsConfigs != null){
             AsyncManager.me().execute(AsyncFactory.sendSms(sendSmsConfigs,"SMS_271490074"));
         }
+
+        //发极光推送
+        List<SysUser> sysUsers = sysUserService.selectUserByDeptId(100L);
+        String notificationTitle = "消息通知";
+        String msgTitle = "开工审核";
+        String msgContent = "您有一条开工审核信息，请及时处理！";
+        String jPushVO = "";
+        List<String> listS = sysUsers.stream().map(SysUser::getJgId).collect(Collectors.toList());
+        String[]  registrationId = (String[]) listS.toArray();
+        JPushToolUtil.sendToRegistrationId(notificationTitle,msgTitle,msgContent,jPushVO,registrationId);
+
+
         return count;
     }
 
@@ -167,6 +186,38 @@ public class ZsyzKgxxServiceImpl implements IZsyzKgxxService {
                 zsyzFjMapper.insertZsyzFj(zsyzFj);
             }
         }
+
+        //插入流程记录表
+        SysDept dept = SecurityUtils.getLoginUser().getUser().getDept();
+        ZsyzLcjl zsyzLcjl = new ZsyzLcjl();
+        zsyzLcjl.setXmId(zsyzSbbzb.getId());
+        zsyzLcjl.setXmmc(zsyzKgxx.getXmmc());
+        zsyzLcjl.setXmbh(zsyzKgxx.getXmbh());
+        zsyzLcjl.setDeptId(dept.getDeptId());
+        String deptName = dept.getDeptName();
+        zsyzLcjl.setDeptName(deptName);
+        zsyzLcjl.setProgress(FOR);
+        zsyzLcjl.setXmStatus(ONE);
+        zsyzLcjlMapper.insertZsyzLcjl(zsyzLcjl);
+
+        //发送短信
+        SendSmsConfig sendSmsConfig = new SendSmsConfig();
+        sendSmsConfig.setProgress(ONE);
+        List<SendSmsConfig> sendSmsConfigs = sendSmsConfigService.selectSendSmsConfigList(sendSmsConfig);
+        if (sendSmsConfigs != null){
+            AsyncManager.me().execute(AsyncFactory.sendSms(sendSmsConfigs,"SMS_271490074"));
+        }
+
+        //发极光推送
+        List<SysUser> sysUsers = sysUserService.selectUserByDeptId(100L);
+        String notificationTitle = "消息通知";
+        String msgTitle = "开工审核";
+        String msgContent = "您有一条开工审核信息，请及时处理！";
+        String jPushVO = "";
+        List<String> listS = sysUsers.stream().map(SysUser::getJgId).collect(Collectors.toList());
+        String[]  registrationId = (String[]) listS.toArray();
+        JPushToolUtil.sendToRegistrationId(notificationTitle,msgTitle,msgContent,jPushVO,registrationId);
+
         return count;
     }
 

ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/projectV2/ZsyzQyxxServiceImpl.java

@@ -4,6 +4,7 @@ import com.ruoyi.common.core.domain.entity.SysDept;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.jPush.JPushToolUtil;
 import com.ruoyi.framework.manager.AsyncManager;
 import com.ruoyi.framework.manager.factory.AsyncFactory;
 import com.ruoyi.system.domain.projectV2.ZsyzFj;
@@ -15,6 +16,7 @@ import com.ruoyi.system.mapper.projectV2.ZsyzFjMapper;
 import com.ruoyi.system.mapper.projectV2.ZsyzLcjlMapper;
 import com.ruoyi.system.mapper.projectV2.ZsyzQyxxMapper;
 import com.ruoyi.system.mapper.projectV2.ZsyzSbbzbMapper;
+import com.ruoyi.system.service.ISysUserService;
 import com.ruoyi.system.service.projectV2.IZsyzQyxxService;
 import com.ruoyi.system.service.projectV2.common.ISendSmsConfigService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -22,6 +24,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
+import java.util.stream.Collectors;
 
 import static com.ruoyi.common.constant.CommonConstants.*;
 
@@ -45,6 +48,8 @@ public class ZsyzQyxxServiceImpl implements IZsyzQyxxService {
 
     @Autowired
     private ISendSmsConfigService sendSmsConfigService;
+    @Autowired
+    private ISysUserService sysUserService;
 
     /**
      * 查询招商引资_签约信息
@@ -113,7 +118,7 @@ public class ZsyzQyxxServiceImpl implements IZsyzQyxxService {
         SysDept dept = SecurityUtils.getLoginUser().getUser().getDept();
         ZsyzLcjl zsyzLcjl = new ZsyzLcjl();
         zsyzLcjl.setXmId(zsyzSbbzb.getId());
-        zsyzLcjl.setXmmc(zsyzQyxx.getXmmc());
+        zsyzLcjl.setXmmc(zsyzQyxx.getXmxsmc());
         zsyzLcjl.setXmbh(zsyzQyxx.getXmbh());
         zsyzLcjl.setDeptId(dept.getDeptId());
         String deptName = dept.getDeptName();
@@ -129,6 +134,17 @@ public class ZsyzQyxxServiceImpl implements IZsyzQyxxService {
         if (sendSmsConfigs != null){
             AsyncManager.me().execute(AsyncFactory.sendSms(sendSmsConfigs,"SMS_271500071"));
         }
+
+        //发极光推送
+        List<SysUser> sysUsers = sysUserService.selectUserByDeptId(100L);
+        String notificationTitle = "消息通知";
+        String msgTitle = "签约审核";
+        String msgContent = "您有一条签约审核信息，请及时处理！";
+        String jPushVO = "";
+        List<String> listS = sysUsers.stream().map(SysUser::getJgId).collect(Collectors.toList());
+        String[]  registrationId = (String[]) listS.toArray();
+        JPushToolUtil.sendToRegistrationId(notificationTitle,msgTitle,msgContent,jPushVO,registrationId);
+
         return count;
 
     }
@@ -172,6 +188,38 @@ public class ZsyzQyxxServiceImpl implements IZsyzQyxxService {
                 }
             }
         }
+
+        //插入流程记录表
+        SysDept dept = SecurityUtils.getLoginUser().getUser().getDept();
+        ZsyzLcjl zsyzLcjl = new ZsyzLcjl();
+        zsyzLcjl.setXmId(zsyzSbbzb.getId());
+        zsyzLcjl.setXmmc(zsyzQyxx.getXmxsmc());
+        zsyzLcjl.setXmbh(zsyzQyxx.getXmbh());
+        zsyzLcjl.setDeptId(dept.getDeptId());
+        String deptName = dept.getDeptName();
+        zsyzLcjl.setDeptName(deptName);
+        zsyzLcjl.setProgress(THR);
+        zsyzLcjl.setXmStatus(ONE);
+        zsyzLcjlMapper.insertZsyzLcjl(zsyzLcjl);
+
+        //发送短信
+        SendSmsConfig sendSmsConfig = new SendSmsConfig();
+        sendSmsConfig.setProgress(ONE);
+        List<SendSmsConfig> sendSmsConfigs = sendSmsConfigService.selectSendSmsConfigList(sendSmsConfig);
+        if (sendSmsConfigs != null){
+            AsyncManager.me().execute(AsyncFactory.sendSms(sendSmsConfigs,"SMS_271500071"));
+        }
+
+        //发极光推送
+        List<SysUser> sysUsers = sysUserService.selectUserByDeptId(100L);
+        String notificationTitle = "消息通知";
+        String msgTitle = "签约审核";
+        String msgContent = "您有一条签约审核信息，请及时处理！";
+        String jPushVO = "";
+        List<String> listS = sysUsers.stream().map(SysUser::getJgId).collect(Collectors.toList());
+        String[]  registrationId = (String[]) listS.toArray();
+        JPushToolUtil.sendToRegistrationId(notificationTitle,msgTitle,msgContent,jPushVO,registrationId);
+
         return count;
     }
 

ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/projectV2/ZsyzSbbzbServiceImpl.java

@@ -11,6 +11,7 @@ import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.MessageUtils;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.http.HttpUtils;
+import com.ruoyi.common.utils.jPush.JPushToolUtil;
 import com.ruoyi.common.utils.sign.Md5Utils;
 import com.ruoyi.framework.manager.AsyncManager;
 import com.ruoyi.framework.manager.factory.AsyncFactory;
@@ -19,6 +20,7 @@ import com.ruoyi.system.domain.projectV2.ZsyzLcjl;
 import com.ruoyi.system.domain.projectV2.ZsyzSbbzb;
 import com.ruoyi.system.domain.projectV2.common.SendSmsConfig;
 import com.ruoyi.system.mapper.projectV2.*;
+import com.ruoyi.system.service.ISysUserService;
 import com.ruoyi.system.service.projectV2.IZsyzSbbzbService;
 import com.ruoyi.system.service.projectV2.common.ISendSmsConfigService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -28,6 +30,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 import static com.ruoyi.common.constant.CommonConstants.*;
 
@@ -56,6 +59,8 @@ public class ZsyzSbbzbServiceImpl implements IZsyzSbbzbService {
 
     @Autowired
     private ISendSmsConfigService sendSmsConfigService;
+    @Autowired
+    private ISysUserService sysUserService;
 
     /**
      * 企查查
@@ -175,6 +180,17 @@ public class ZsyzSbbzbServiceImpl implements IZsyzSbbzbService {
         if (sendSmsConfigs != null){
             AsyncManager.me().execute(AsyncFactory.sendSms(sendSmsConfigs,"SMS_271465081"));
         }
+
+        //发极光推送
+        List<SysUser> sysUsers = sysUserService.selectUserByDeptId(100L);
+        String notificationTitle = "消息通知";
+        String msgTitle = "首谈审核";
+        String msgContent = "您有一条首谈审核信息，请及时处理！";
+        String jPushVO = "";
+        List<String> listS = sysUsers.stream().map(SysUser::getJgId).collect(Collectors.toList());
+        String[]  registrationId = (String[]) listS.toArray();
+        JPushToolUtil.sendToRegistrationId(notificationTitle,msgTitle,msgContent,jPushVO,registrationId);
+
         return count;
     }
 
@@ -210,6 +226,24 @@ public class ZsyzSbbzbServiceImpl implements IZsyzSbbzbService {
                 }
             }
         }
+
+        //发送短信
+        SendSmsConfig sendSmsConfig = new SendSmsConfig();
+        sendSmsConfig.setProgress(ONE);
+        List<SendSmsConfig> sendSmsConfigs = sendSmsConfigService.selectSendSmsConfigList(sendSmsConfig);
+        if (sendSmsConfigs != null){
+            AsyncManager.me().execute(AsyncFactory.sendSms(sendSmsConfigs,"SMS_271465081"));
+        }
+
+        //发极光推送
+        List<SysUser> sysUsers = sysUserService.selectUserByDeptId(100L);
+        String notificationTitle = "消息通知";
+        String msgTitle = "首谈审核";
+        String msgContent = "您有一条首谈审核信息，请及时处理！";
+        String jPushVO = "";
+        List<String> listS = sysUsers.stream().map(SysUser::getJgId).collect(Collectors.toList());
+        String[]  registrationId = (String[]) listS.toArray();
+        JPushToolUtil.sendToRegistrationId(notificationTitle,msgTitle,msgContent,jPushVO,registrationId);
         return count;
     }
 

ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/projectV2/ZsyzTcxxServiceImpl.java

@@ -1,8 +1,10 @@
 package com.ruoyi.framework.web.service.projectV2;
 
 import com.ruoyi.common.core.domain.entity.SysDept;
+import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.jPush.JPushToolUtil;
 import com.ruoyi.framework.manager.AsyncManager;
 import com.ruoyi.framework.manager.factory.AsyncFactory;
 import com.ruoyi.system.domain.projectV2.*;
@@ -11,6 +13,7 @@ import com.ruoyi.system.mapper.projectV2.ZsyzFjMapper;
 import com.ruoyi.system.mapper.projectV2.ZsyzLcjlMapper;
 import com.ruoyi.system.mapper.projectV2.ZsyzSbbzbMapper;
 import com.ruoyi.system.mapper.projectV2.ZsyzTcxxMapper;
+import com.ruoyi.system.service.ISysUserService;
 import com.ruoyi.system.service.projectV2.IZsyzTcxxService;
 import com.ruoyi.system.service.projectV2.common.ISendSmsConfigService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -18,6 +21,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
+import java.util.stream.Collectors;
 
 import static com.ruoyi.common.constant.CommonConstants.*;
 
@@ -44,6 +48,8 @@ public class ZsyzTcxxServiceImpl implements IZsyzTcxxService {
 
     @Autowired
     private ISendSmsConfigService sendSmsConfigService;
+    @Autowired
+    private ISysUserService sysUserService;
     /**
      * 查询招商引资_投产信息
      *
@@ -127,6 +133,16 @@ public class ZsyzTcxxServiceImpl implements IZsyzTcxxService {
         if (sendSmsConfigs != null){
             AsyncManager.me().execute(AsyncFactory.sendSms(sendSmsConfigs,"SMS_271575058"));
         }
+
+        //发极光推送
+        List<SysUser> sysUsers = sysUserService.selectUserByDeptId(100L);
+        String notificationTitle = "消息通知";
+        String msgTitle = "投产审核";
+        String msgContent = "您有一条投产审核信息，请及时处理！";
+        String jPushVO = "";
+        List<String> listS = sysUsers.stream().map(SysUser::getJgId).collect(Collectors.toList());
+        String[]  registrationId = (String[]) listS.toArray();
+        JPushToolUtil.sendToRegistrationId(notificationTitle,msgTitle,msgContent,jPushVO,registrationId);
         return count;
 
     }
@@ -170,6 +186,35 @@ public class ZsyzTcxxServiceImpl implements IZsyzTcxxService {
                 }
             }
         }
+
+        //插入流程记录表
+        SysDept dept = SecurityUtils.getLoginUser().getUser().getDept();
+        ZsyzLcjl zsyzLcjl = new ZsyzLcjl();
+        zsyzLcjl.setXmId(zsyzSbbzb.getId());
+        zsyzLcjl.setXmmc(zsyzTcxx.getXmmc());
+        zsyzLcjl.setXmbh(zsyzTcxx.getXmbh());
+        zsyzLcjl.setDeptId(dept.getDeptId());
+        String deptName = dept.getDeptName();
+        zsyzLcjl.setDeptName(deptName);
+        zsyzLcjl.setProgress(FIV);
+        zsyzLcjl.setXmStatus(ONE);
+        zsyzLcjlMapper.insertZsyzLcjl(zsyzLcjl);
+        //发送短信
+        SendSmsConfig sendSmsConfig = new SendSmsConfig();
+        sendSmsConfig.setProgress(ONE);
+        List<SendSmsConfig> sendSmsConfigs = sendSmsConfigService.selectSendSmsConfigList(sendSmsConfig);
+        if (sendSmsConfigs != null){
+            AsyncManager.me().execute(AsyncFactory.sendSms(sendSmsConfigs,"SMS_271575058"));
+        }
+        //发极光推送
+        List<SysUser> sysUsers = sysUserService.selectUserByDeptId(100L);
+        String notificationTitle = "消息通知";
+        String msgTitle = "投产审核";
+        String msgContent = "您有一条投产审核信息，请及时处理！";
+        String jPushVO = "";
+        List<String> listS = sysUsers.stream().map(SysUser::getJgId).collect(Collectors.toList());
+        String[]  registrationId = (String[]) listS.toArray();
+        JPushToolUtil.sendToRegistrationId(notificationTitle,msgTitle,msgContent,jPushVO,registrationId);
         return count;
     }
 

ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/projectV2/common/ZsyzCommonServiceImpL.java

@@ -9,6 +9,7 @@ import com.ruoyi.common.core.redis.RedisCache;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.jPush.JPushToolUtil;
 import com.ruoyi.framework.manager.AsyncManager;
 import com.ruoyi.framework.manager.factory.AsyncFactory;
 import com.ruoyi.system.domain.projectV2.*;
@@ -107,6 +108,7 @@ public class ZsyzCommonServiceImpL implements IZsyzCommonService {
             String deptName = dept.getDeptName();
             zsyzLcjl.setDeptName(deptName);
             zsyzLcjl.setProgress(zsyzSbbzb.getProgress());
+            zsyzLcjl.setXmStatus(zsyzSbbzb.getXmStatus());
             zsyzLcjlMapper.insertZsyzLcjl(zsyzLcjl);
             return AjaxResult.success();
         }
@@ -404,6 +406,7 @@ public class ZsyzCommonServiceImpL implements IZsyzCommonService {
         String deptName = dept.getDeptName();
         zsyzLcjl.setDeptName(deptName);
         zsyzLcjl.setProgress(zsyzSbbzb.getProgress());
+        zsyzLcjl.setXmStatus(shjg);
         zsyzLcjlMapper.insertZsyzLcjl(zsyzLcjl);
         return AjaxResult.success();
     }
@@ -634,6 +637,15 @@ public class ZsyzCommonServiceImpL implements IZsyzCommonService {
                 //发送短信
                 List<SysUser> sysUsers = sysUserService.selectUserByDeptId(zsyzProjectDept.getDeptId());
                 if (sysUsers != null) {
+                    //发极光推送
+                    String notificationTitle = "消息通知";
+                    String msgTitle = "项目承接";
+                    String msgContent = "您有一条项目承接信息，请及时处理！";
+                    String jPushVO = "";
+                    List<String> listS = sysUsers.stream().map(SysUser::getJgId).collect(Collectors.toList());
+                    String[]  registrationId = (String[]) listS.toArray();
+                    JPushToolUtil.sendToRegistrationId(notificationTitle,msgTitle,msgContent,jPushVO,registrationId);
+
                     for (SysUser sysUser : sysUsers) {
                         if (StringUtils.isNotEmpty(sysUser.getPhonenumber())) {
                             SendSmsConfig sendSmsConfig = new SendSmsConfig();
@@ -658,6 +670,14 @@ public class ZsyzCommonServiceImpL implements IZsyzCommonService {
                 //发送短信
                 List<SysUser> sysUsers = sysUserService.selectUserByDeptId(zsyzProjectDept.getDeptId());
                 if (sysUsers != null) {
+                    //发极光推送
+                    String notificationTitle = "消息通知";
+                    String msgTitle = "项目审核";
+                    String msgContent = "您有一条项目审核信息，请及时处理！";
+                    String jPushVO = "";
+                    List<String> listS = sysUsers.stream().map(SysUser::getJgId).collect(Collectors.toList());
+                    String[]  registrationId = (String[]) listS.toArray();
+                    JPushToolUtil.sendToRegistrationId(notificationTitle,msgTitle,msgContent,jPushVO,registrationId);
                     for (SysUser sysUser : sysUsers) {
                         if (StringUtils.isNotEmpty(sysUser.getPhonenumber())) {
                             SendSmsConfig sendSmsConfig = new SendSmsConfig();
@@ -684,7 +704,7 @@ public class ZsyzCommonServiceImpL implements IZsyzCommonService {
         SysDept dept = SecurityUtils.getLoginUser().getUser().getDept();
         ZsyzLcjl zsyzLcjl = new ZsyzLcjl();
         zsyzLcjl.setXmId(zpVo.getXmId());
-        zsyzLcjl.setXmmc(zpVo.getXmmc());
+        zsyzLcjl.setXmmc(zpVo.getYjdwList().get(0).getXmmc());
         zsyzLcjl.setXmbh(zpVo.getXmbh());
         zsyzLcjl.setDeptId(dept.getDeptId());
         String deptName = dept.getDeptName();

ruoyi-system/src/main/resources/mapper/system/projectV2/ZsyzShyjMapper.xml

@@ -70,7 +70,7 @@
     </select>
 
 
-<!--    <select id="selectZsyzShyjListByWt" resultMap="ZsyzShyjResult">
+    <!--<select id="selectZsyzShyjListByWt" resultMap="ZsyzShyjResult">
         SELECT
         ANY_VALUE ( s.id ) as id,
         ANY_VALUE ( s.xm_id ) as xm_id ,