ganzi/ganzi-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

代码优化

Browse Source
This commit is contained in:
zhengqiaowen 2022-11-18 17:39:44 +08:00
parent 9511184041
commit 4114fe9533
4 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
inventory-dao/src/main/java/com/rzyc/bean/task/dto/WorkFlowDto.java
View File

@ -18,7 +18,7 @@ public class WorkFlowDto {
private String oaDistributionId;
@ApiModelProperty(value = "任务接收人id",required = true)
private String SysUserId;
private String sysUserId;
public String getOaDistributionId() {
return oaDistributionId;
@ -29,10 +29,10 @@ public class WorkFlowDto {
}
public String getSysUserId() {
return SysUserId;
return sysUserId;
}
public void setSysUserId(String sysUserId) {
SysUserId = sysUserId;
this.sysUserId = sysUserId;
}
}

10
inventory-dao/src/main/resources/mapper/OADistributionMapper.xml
View File

@ -167,15 +167,15 @@
<!--批量添加-->
<insert id="insertList" parameterType="com.rzyc.model.check.ChkGovBillDetailWithBLOBs">
insert into OADistribution (OADistributionId, OATaskId, SysUserId,
SysChinaName, SysTelephone, AppStatus,
SysChinaName, SysTelephone, title,subject,flow_time,flow_state,start_time,end_time,AppStatus,
CreatedOn, CreatedBy, ModifiedOn,
ModifiedBy)
values
<foreach collection ="records" item="record" index= "index" separator =",">
(#{record.oadistributionid,jdbcType=VARCHAR}, #{record.oataskid,jdbcType=VARCHAR},
#{record.sysuserid,jdbcType=VARCHAR},
#{record.syschinaname,jdbcType=VARCHAR}, #{record.systelephone,jdbcType=VARCHAR},
#{record.appstatus,jdbcType=VARCHAR},
#{record.syschinaname,jdbcType=VARCHAR}, #{record.systelephone,jdbcType=VARCHAR}, #{record.title},#{record,subject},
#{record.flowTime},#{record.flowState},#{record.startTime},#{record.endTime},#{record.appstatus,jdbcType=VARCHAR},
#{record.createdon,jdbcType=TIMESTAMP}, #{record.createdby,jdbcType=VARCHAR},
#{record.modifiedon,jdbcType=TIMESTAMP},
#{record.modifiedby,jdbcType=VARCHAR})
@ -284,12 +284,12 @@
<insert id="deliverTask" parameterType="java.util.List">
insert into
OADistribution (OADistributionId, OATaskId, sned_id,SysUserId,
SysChinaName, SysTelephone, AppStatus,title,subject,start_time,end_time,
SysChinaName, SysTelephone, AppStatus,title,subject,flow_time,flow_state,start_time,end_time,
CreatedOn, CreatedBy, ModifiedOn,ModifiedBy)
values
<foreach collection="distributions" item="item" index="index" separator="," >
(#{item.oadistributionid}, #{item.oataskid}, #{item.snedId},#{item.sysuserid},
#{item.syschinaname}, #{item.systelephone}, #{item.appstatus},#{item.title},#{item.subject},#{item.startTime},#{item.endTime},
#{item.syschinaname}, #{item.systelephone}, #{item.appstatus},#{item.title},#{item.subject},#{item.flowTime},#{item.flowState},#{item.startTime},#{item.endTime},
#{item.createdon}, #{item.createdby}, #{item.modifiedon},
#{item.modifiedby})
</foreach>

13
inventory-dao/src/main/resources/mapper/OATaskMapper.xml
View File

@ -441,12 +441,13 @@
<!--查询我发布的任务-->
<select id="deliverTaskList" resultType="com.rzyc.bean.task.vo.TaskVo">
select ot.OATaskId,ty.name as taskTypeName,ot.title,u.SysUserName as send_name,u.SysDeptName as unit_name,ot.AppStatus,ot.EndDate as enddate
from OATask ot
left join sysuser u on ot.send_id = u.SysUserId
left join oa_task_type ty on ot.TaskType = ty.type_id
where ot.subject like #{condition}
and ot.send_id = #{sendId}
select ot.OATaskId,ty.name as taskTypeName,od.OADistributionId,ot.title,u.SysUserName as send_name,u.SysDeptName as unit_name,ot.AppStatus,ot.EndDate as enddate
from OADistribution od
join OATask ot
on od.OATaskId = ot.OATaskId
join sysuser u on ot.send_id = u.SysUserId
join oa_task_type ty on ot.TaskType = ty.type_id
where ot.subject like #{condition} and od.sned_id = #{sendId}
order by ot.EndDate asc
</select>

7
inventory-gov/src/main/java/com/rzyc/controller/WorkController.java
View File

@ -132,7 +132,6 @@ public class WorkController extends BaseController{
public SingleResult<String> distributeWork(@Valid TaskAddOrUpdateDto addTaskDto) throws Exception{
SingleResult<String> result = new SingleResult<>();
OATask oaTask = oaTaskMapper.findById(addTaskDto.getOataskid());
//List<UserVo> userNameList = oaTaskMapper.getUserNameList(addTaskDto.getSysuserid());
String[] sysuid = addTaskDto.getSysuserid().split(",");
List<OADistribution> list = new ArrayList<>();
for (String uid: sysuid) {
@ -141,8 +140,6 @@ public class WorkController extends BaseController{
oaDistribution.setOataskid(addTaskDto.getOataskid());
oaDistribution.setSnedId(oaTask.getSendId());
oaDistribution.setSysuserid(uid);
/* oaDistribution.setStartTime(oaTask.getStartdate());
oaDistribution.setEndTime(oaTask.getEnddate());*/
oaDistribution.setFlowState(1);
oaDistribution.setAppstatus("1");
oaDistribution.setCreatedby(getUserId());
@ -319,6 +316,7 @@ public class WorkController extends BaseController{
oaDistribution.setCreatedby(getUserId());
oaDistribution.setCreatedon(new Date());
list.add(oaDistribution);
System.err.println("插入的内容" + oaDistribution);
}else {
result.setCode(0);
@ -327,6 +325,7 @@ public class WorkController extends BaseController{
}
}
oaDistributionMapper.deliverTask(list);
work.setFlowTime(new Date());
work.setFlowState(2);
oaDistributionMapper.updateDistriubtion(work);
@ -401,7 +400,7 @@ public class WorkController extends BaseController{
MultiResult<FlowUserVo> result = new MultiResult();
OADistribution oaDistribution = oaDistributionMapper.selectDistribution(flowUserDto.getOADistributionId());
System.err.println("流转状态=====" + oaDistribution.getFlowState());
System.err.println("流转状态=====" + oaDistribution);
System.err.println("主任务信息=====" + oaDistribution);
if(oaDistribution.getFlowState() == 2){
List<FlowUserVo> list = oaDistributionMapper.selectFlowUser(flowUserDto);
result.setData(list);