消息等

src/main/java/com/sa/zentao/qo/ZtReleaseQo.java

@@ -64,4 +64,7 @@ public class ZtReleaseQo extends BaseQo {
     private Integer ysFlag;
     //
     private String ysUser;
+
+    private String  orderName;
+    private String  orderSort;
 }

src/main/java/com/sa/zentao/service/VxService.java

@@ -141,7 +141,7 @@ public class VxService {
 
             Map<String, Object> map = new HashMap<String, Object>();
             map.put("touser", vxId);
-//
+//            map.put("touser", "lisi");
             map.put("agentid", agentid);
 //            map.put("agentid", 3010185);
             map.put("safe", 0);

src/main/java/com/sa/zentao/service/impl/ZtStoryServiceImpl.java

@@ -274,8 +274,10 @@ public class ZtStoryServiceImpl extends ServiceImpl<ZtStoryMapper, ZtStory> impl
 
     private void storySendZpMessage(Integer id, String oldUser,String newUser) {
         if(ObjectUtils.notEqual(oldUser, newUser)&&!StringUtils.isEmpty(newUser)){
-
-            this.vxService.sendMessageToVx(newUser, VxMessageUtils.storyMessage.assignToMessage(id),new Date());
+            List<ZtProjectstory> storyExecutions = this.projectstoryService.projectListByStory(Arrays.asList(id), ProjectTypeEnums.execution);
+            if(!CollectionUtils.isEmpty(storyExecutions)){
+                this.vxService.sendMessageToVx(newUser, VxMessageUtils.storyMessage.assignToMessage(id),new Date());
+            }
         }
     }
 

src/main/java/com/sa/zentao/service/impl/ZtTaskServiceImpl.java

@@ -114,6 +114,7 @@ public class ZtTaskServiceImpl extends ServiceImpl<ZtTaskMapper, ZtTask> impleme
         if (ztTask == null) {
             throw new BusinessException("未查询到数据");
         }
+        String oldAssignTo = ztTask.getAssignedTo();
         ztTask.setAssignedTo(dto.getAssignedTo());
         ztTask.setLasteditedby(RiskUserThreadLocal.get().getName());
         ztTask.setLastediteddate(new Date());
@@ -122,6 +123,7 @@ public class ZtTaskServiceImpl extends ServiceImpl<ZtTaskMapper, ZtTask> impleme
 
         ZtProjectproduct projectproduct = projectproductService.getOne(new QueryWrapper<ZtProjectproduct>().lambda().eq(ZtProjectproduct::getProject, ztTask.getProject()));
 
+        taskSendZpMessage(ztTask.getId(), oldAssignTo, ztTask.getAssignedTo());
 
         actionService.addAction(ActionType.RW, ActionStatus.FP, ztTask.getId()
                 , projectproduct == null ? null : projectproduct.getProduct().toString(), projectproduct == null ? null : projectproduct.getProject(), ztTask.getExecution(),

src/main/resources/application-local.yml

@@ -52,27 +52,27 @@ file:
 #
 #file:
 #  baseUrl: http://127.0.0.1:8085
-#vx:
-#  agentld: 1000002
-#  token: DGkygyJELpIY2
-#  encodingAesKey: Pp2D1vttrxVMoTzocD1SukkRe3IYXQjW5nuOjvc2JRE
-#  receiveid: ww0b2dc90421854148
-#  corpid: ww0b2dc90421854148
-#  corpsecret: LRVwfc11K-JQS2nJC8xTPrZLBKmMRZ7nPyGchsVfKF4
-#  salaryCorpsecretApp: biYcz9e1gIJSsAaTgCZXbcO8Vh9YT11JtaFeZPaPmtU
-#  salaryCorpsecretAppUrl: https://qyapi.weixin.qq.com/cgi-bin/message/send
-#  dkcorpsecret: biYcz9e1gIJSsAaTgCZXbcO8Vh9YT11JtaFeZPaPmtU   #书籍
-
-
-
 vx:
-  agentld: 1000059
-  token: vTniTyOG4csBmAnMr
-  encodingAesKey : gCmhw7vKLcZwsDszILPNSEqyjgRKODemkYmRFdfelmk
-  receiveid: wwa7cc4743271d6055
-  corpid: wwa7cc4743271d6055
-  corpsecret: qQNdRmtanymbshPOLgWTgB-TzX9QmNpVCpOx5suJ2xA
-  dkCorpsecret: 1MWQxoL8QtypfdnKJqdo3pGdZDAmdhqTF_MaWm3rVjs
-  salaryCorpsecretApp: BsgdcmLV5L1jbO7uro9QqdgGQaGItVb_tvfaasAq_3w
+  agentld: 1000002
+  token: DGkygyJELpIY2
+  encodingAesKey: Pp2D1vttrxVMoTzocD1SukkRe3IYXQjW5nuOjvc2JRE
+  receiveid: ww0b2dc90421854148
+  corpid: ww0b2dc90421854148
+  corpsecret: LRVwfc11K-JQS2nJC8xTPrZLBKmMRZ7nPyGchsVfKF4
+  salaryCorpsecretApp: biYcz9e1gIJSsAaTgCZXbcO8Vh9YT11JtaFeZPaPmtU
   salaryCorpsecretAppUrl: https://qyapi.weixin.qq.com/cgi-bin/message/send
-  dkcorpsecret: 1MWQxoL8QtypfdnKJqdo3pGdZDAmdhqTF_MaWm3rVjs
+  dkcorpsecret: biYcz9e1gIJSsAaTgCZXbcO8Vh9YT11JtaFeZPaPmtU   #书籍
+
+
+
+#vx:
+#  agentld: 1000059
+#  token: vTniTyOG4csBmAnMr
+#  encodingAesKey : gCmhw7vKLcZwsDszILPNSEqyjgRKODemkYmRFdfelmk
+#  receiveid: wwa7cc4743271d6055
+#  corpid: wwa7cc4743271d6055
+#  corpsecret: qQNdRmtanymbshPOLgWTgB-TzX9QmNpVCpOx5suJ2xA
+#  dkCorpsecret: 1MWQxoL8QtypfdnKJqdo3pGdZDAmdhqTF_MaWm3rVjs
+#  salaryCorpsecretApp: BsgdcmLV5L1jbO7uro9QqdgGQaGItVb_tvfaasAq_3w
+#  salaryCorpsecretAppUrl: https://qyapi.weixin.qq.com/cgi-bin/message/send
+#  dkcorpsecret: 1MWQxoL8QtypfdnKJqdo3pGdZDAmdhqTF_MaWm3rVjs

src/main/resources/mapper/ZtReleaseDetailsMapper.xml

@@ -41,7 +41,24 @@
         <if test="qo.storyId != null ">
             and s.id = #{qo.storyId}
         </if>
-        group by s.id
+
+
+        <choose>
+            <when test="qo.orderName != '' and qo.orderName != null  ">
+                <choose>
+                    <when test="qo.orderSort != '' and qo.orderSort != null  ">
+                        order  by s.${qo.orderName}  ${qo.orderSort}
+                    </when>
+                    <otherwise>
+                        order by s.id desc
+                    </otherwise>
+                </choose>
+            </when>
+            <otherwise>
+                order by s.id desc
+            </otherwise>
+        </choose>
+
 
     </select>