FT/foton-wkflow-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
super_liu
2022-01-11 22:56:11 +08:00
parent 4fd2c5fdb8 3a4bfe373f
commit 9cef46040b
9 changed files with 48 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/ydw/bat/wkflow/business_main/datas/controller/BusProcessNewController.java
+7
View File
@@ -54,6 +54,13 @@ public class BusProcessNewController extends BaseAction {
return findtodotask;
}
@ApiOperation(value = "每天十点需要启动 标准化活动参会流程")
@GetMapping("/everyDayTenOlockSAM")
public List<BusProcessNew> everyDayTenOlockSAM() {
List<BusProcessNew> findtodotask = iBusProcessNewService.everyDayTenOlockSAM();
return findtodotask;
}
}
src/main/java/com/ydw/bat/wkflow/business_main/datas/mapper/BusProcessNewMapper.java
+2
View File
@@ -32,4 +32,6 @@ public interface BusProcessNewMapper extends BaseMapper<BusProcessNew> {
List<BusProcessNew> everyDayTenOlock();
List<BusProcessNew> everyDayTenOlockSAM();
}
src/main/java/com/ydw/bat/wkflow/business_main/datas/service/IBusProcessNewService.java
+1
View File
@@ -34,5 +34,6 @@ public interface IBusProcessNewService extends IService<BusProcessNew> {
List<BusProcessNew> findLastworkPeople2(@Param("key")String key, @Param("pId")String pId);
List<BusProcessNew> everyDayTenOlock();
List<BusProcessNew> everyDayTenOlockSAM();
}
src/main/java/com/ydw/bat/wkflow/business_main/datas/service/impl/BusProcessNewServiceImpl.java
+6
View File
@@ -83,4 +83,10 @@ public class BusProcessNewServiceImpl extends ServiceImpl<BusProcessNewMapper, B
public List<BusProcessNew> everyDayTenOlock() {
return baseMapper.everyDayTenOlock();
}
@Override
public List<BusProcessNew> everyDayTenOlockSAM() {
return baseMapper.everyDayTenOlockSAM();
}
}
src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/AutoStartAfter.java
+12 -2
View File
@@ -42,11 +42,21 @@ public class AutoStartAfter implements TaskListener {
if(StringUtils.isNotBlank(object.getString("member"))) {
prcName = prcName + "参会人上传会议资料，填写标准及议题";
nextUserList.add(object.getString("member"));
delegateTask.setVariable("member", object.getString("member"));
prcName = prcName + "参会人上传会议资料，填写标准及议题";
if ("1".equals(object.getString("auto"))) {
delegateTask.setVariable("member", object.getString("member"));
nextUserList.add(object.getString("member"));
} else {
if (StringUtils.isNotBlank(object.getString("memberId"))) {
delegateTask.setVariable("member", object.getString("memberId"));
nextUserList.add(object.getString("memberId"));
}
}
}
//截止时间 流程描述 创建人
//截止时间 流程描述 创建人
String user = object.getString("prcCreateUser");
delegateTask.setVariable("createUser", user);
String username = object.getString("prcCreateUserName");
src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step10After.java
-2
View File
@@ -49,7 +49,6 @@ public class Step10After implements TaskListener {
if (!jsonArray.isEmpty()){
jsonArray.forEach(o -> {
JSONObject object1=JSONObject.parseObject(o.toString());
if ("1".equals(object1.getString("state")) || "2".equals(object1.getString("state"))) {
SarPublicIdeaAll sarPublicIdeaAll = new SarPublicIdeaAll();
if (null!=object1.get("id")){
sarPublicIdeaAll.setId(object1.getString("id"));
@@ -72,7 +71,6 @@ public class Step10After implements TaskListener {
sarPublicIdeaAll.setState(object1.getString("state"));
sarPublicIdeaAll.setCause(object1.getString("cause"));
sarPublicIdeaAlls.add(sarPublicIdeaAll);
}
});
}
lawsUserInfoService.savePublicIdeaBatch(sarPublicIdeaAlls);
src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/EngineerReviseDoneAfter.java
+1 -1
View File
@@ -194,7 +194,7 @@ public class EngineerReviseDoneAfter implements TaskListener {
busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
busProcessNewNext.setMesg(object.toJSONString());
busProcessNewNext.setFinishFlag("0");
busProcessNewNext.setTaskInfo(delegateTask.getName());
busProcessNewNext.setTaskInfo("标准化活动参会流程-流程结束");
busProcessNewNext.setPrcName(prcName);
busBean.save(busProcessNewNext);
infoService.addMeeting(sapMeeting);
src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/WriteMaterialAfter.java
+6 -6
View File
@@ -89,16 +89,16 @@ public class WriteMaterialAfter implements TaskListener {
JSONObject object1 = object.getJSONObject("ch_pageData");
WgWorkGroupShowDTO wgWorkGroupShowDTO = new WgWorkGroupShowDTO();
if (StringUtils.isNotEmpty(object1.getString("comityName"))) {
wgWorkGroupShowDTO.setId(object1.getString("comityName"));
if (StringUtils.isNotEmpty(object1.getString("associaName"))) {
wgWorkGroupShowDTO.setId(object1.getString("associaName"));
wgWorkGroupShowDTO.setLevel("1");
wgWorkGroupShowDTO.setNature("1");
if (StringUtils.isNotEmpty(object1.getString("comityNameOne"))) {
wgWorkGroupShowDTO.setId(object1.getString("comityNameOne"));
if (StringUtils.isNotEmpty(object1.getString("associaNameOne"))) {
wgWorkGroupShowDTO.setId(object1.getString("associaNameOne"));
wgWorkGroupShowDTO.setLevel("2");
wgWorkGroupShowDTO.setNature("2");
if (StringUtils.isNotEmpty(object1.getString("comityNameTwo"))) {
wgWorkGroupShowDTO.setId(object1.getString("comityNameTwo"));
if (StringUtils.isNotEmpty(object1.getString("associaNameTwo"))) {
wgWorkGroupShowDTO.setId(object1.getString("associaNameTwo"));
wgWorkGroupShowDTO.setLevel("3");
wgWorkGroupShowDTO.setNature("3");
}
src/main/resources/mapper/datas/BusProcessNewMapper.xml
+13
View File
@@ -50,4 +50,17 @@
CONCAT( date_sub( DATE_FORMAT( NOW(), '%Y-%m-%d' ), INTERVAL 1 DAY), '%')) and TASK_INFO = '政策课题组参会流程-流程结束'
</select>
<select id="everyDayTenOlockSAM" resultType="com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew">
SELECT
*
FROM
bus_process_new
WHERE
MESG -> '$**.meetingStartTime' LIKE CONCAT(
'%',
CONCAT( date_sub( DATE_FORMAT( NOW(), '%Y-%m-%d' ), INTERVAL 1 DAY), '%')) and
TASK_INFO = '标准化活动参会流程-流程结束'
</select>
</mapper>