diff --git a/src/main/java/com/sa/zentao/qo/ZtReleaseQo.java b/src/main/java/com/sa/zentao/qo/ZtReleaseQo.java index 7c0b8aa..57394df 100644 --- a/src/main/java/com/sa/zentao/qo/ZtReleaseQo.java +++ b/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; } diff --git a/src/main/java/com/sa/zentao/service/VxService.java b/src/main/java/com/sa/zentao/service/VxService.java index 39c13a6..c8e7341 100644 --- a/src/main/java/com/sa/zentao/service/VxService.java +++ b/src/main/java/com/sa/zentao/service/VxService.java @@ -141,7 +141,7 @@ public class VxService { Map map = new HashMap(); map.put("touser", vxId); -// +// map.put("touser", "lisi"); map.put("agentid", agentid); // map.put("agentid", 3010185); map.put("safe", 0); diff --git a/src/main/java/com/sa/zentao/service/impl/ZtStoryServiceImpl.java b/src/main/java/com/sa/zentao/service/impl/ZtStoryServiceImpl.java index e21d44a..335362e 100644 --- a/src/main/java/com/sa/zentao/service/impl/ZtStoryServiceImpl.java +++ b/src/main/java/com/sa/zentao/service/impl/ZtStoryServiceImpl.java @@ -274,8 +274,10 @@ public class ZtStoryServiceImpl extends ServiceImpl 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 storyExecutions = this.projectstoryService.projectListByStory(Arrays.asList(id), ProjectTypeEnums.execution); + if(!CollectionUtils.isEmpty(storyExecutions)){ + this.vxService.sendMessageToVx(newUser, VxMessageUtils.storyMessage.assignToMessage(id),new Date()); + } } } diff --git a/src/main/java/com/sa/zentao/service/impl/ZtTaskServiceImpl.java b/src/main/java/com/sa/zentao/service/impl/ZtTaskServiceImpl.java index 160e046..ac64a91 100644 --- a/src/main/java/com/sa/zentao/service/impl/ZtTaskServiceImpl.java +++ b/src/main/java/com/sa/zentao/service/impl/ZtTaskServiceImpl.java @@ -114,6 +114,7 @@ public class ZtTaskServiceImpl extends ServiceImpl 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 impleme ZtProjectproduct projectproduct = projectproductService.getOne(new QueryWrapper().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(), diff --git a/src/main/resources/application-local.yml b/src/main/resources/application-local.yml index 65f8742..f741170 100644 --- a/src/main/resources/application-local.yml +++ b/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 \ No newline at end of file + 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 \ No newline at end of file diff --git a/src/main/resources/mapper/ZtReleaseDetailsMapper.xml b/src/main/resources/mapper/ZtReleaseDetailsMapper.xml index bd39d9a..66ac862 100644 --- a/src/main/resources/mapper/ZtReleaseDetailsMapper.xml +++ b/src/main/resources/mapper/ZtReleaseDetailsMapper.xml @@ -41,7 +41,24 @@ and s.id = #{qo.storyId} - group by s.id + + + + + + + order by s.${qo.orderName} ${qo.orderSort} + + + order by s.id desc + + + + + order by s.id desc + + +