diff --git a/adc-da-activiti/src/main/java/com/adc/da/common/BusProcessName.java b/adc-da-activiti/src/main/java/com/adc/da/common/BusProcessName.java index ca3e9ebd..7e4df154 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/common/BusProcessName.java +++ b/adc-da-activiti/src/main/java/com/adc/da/common/BusProcessName.java @@ -56,4 +56,6 @@ public class BusProcessName implements Serializable { private String isEnd; private String taskBackAssignee; + + private boolean showreceive; } diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java index 899bca1f..659095e0 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java +++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java @@ -13,6 +13,7 @@ import com.adc.da.http.ResponseMessage; import com.adc.da.http.Result; import com.adc.da.common.Page; import com.adc.da.login.util.JwtUtils; +import com.adc.da.slrs.StandardQA.service.Impl.SarAgenldAcceptButtonServiceImpl; import com.adc.da.slrs.esRevisePlan.dao.EsRevisePlanDao; import com.adc.da.slrs.esRevisePlan.entity.EsRevisePlan; import com.adc.da.slrs.esRevisePlan.service.IEsRevisePlanLogService; @@ -83,6 +84,9 @@ public class WorkFlowController { @Autowired private IEsRevisePlanLogService esRevisePlanLogService; + @Autowired + private SarAgenldAcceptButtonServiceImpl sarAgenldAcceptButtonService; + // @Autowired // private ExportExcelMapper exportExcelMapper; @@ -259,6 +263,7 @@ public class WorkFlowController { @ApiOperation(value = "管控流程接收任务") @GetMapping("/acceptTack") public Integer acceptTack(@RequestParam("nowEsId") String nowEsId, @RequestParam("oaFlag") String oaFlag, @RequestParam("taskId") String taskId) { + sarAgenldAcceptButtonService.add(taskId); return workFlowFeignClient.acceptTack(nowEsId,oaFlag,taskId); } @@ -507,6 +512,16 @@ public class WorkFlowController { pageInfo.setCount(Long.valueOf(0)); pageInfo.setPageSize(taskCommonQuery.getSize()); } + for (BusProcessName data : pageInfo.getList()){ + if(StringUtils.isNotBlank(data.getTaskIds())){ + String s = sarAgenldAcceptButtonService.selectIsNot(data.getTaskIds()); + if(s.equals("1")){ + data.setShowreceive(false); + }else { + data.setShowreceive(true); + } + } + } return pageInfo; } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/controller/SarAgenldAcceptButtonController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/controller/SarAgenldAcceptButtonController.java new file mode 100644 index 00000000..cab58629 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/controller/SarAgenldAcceptButtonController.java @@ -0,0 +1,30 @@ +package com.adc.da.slrs.StandardQA.controller; + +import com.adc.da.slrs.StandardQA.service.SarAgenldAcceptButtonService; +import com.adc.da.util.http.ResponseMessage; +import com.adc.da.util.http.Result; +import io.swagger.annotations.Api; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("/${restPath}/lawss/SarAgenldAcceptButton") +@Api(description = "|SarAgenldAcceptButton|") +public class SarAgenldAcceptButtonController { + + @Autowired + private SarAgenldAcceptButtonService sarAgenldAcceptButtonService; + + @GetMapping("/selectIsNot") + public String selectIsNot(String pid){ + return sarAgenldAcceptButtonService.selectIsNot(pid); + } + + @GetMapping("/add") + public ResponseMessage add(String id){ + sarAgenldAcceptButtonService.add(id); + return Result.success(); + } +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/dao/SarAgenldAcceptButtonDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/dao/SarAgenldAcceptButtonDao.java new file mode 100644 index 00000000..a02c091a --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/dao/SarAgenldAcceptButtonDao.java @@ -0,0 +1,9 @@ +package com.adc.da.slrs.StandardQA.dao; + +import com.adc.da.slrs.StandardQA.entity.SarAgenldAcceptButton; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.springframework.stereotype.Repository; + +@Repository +public interface SarAgenldAcceptButtonDao extends BaseMapper { +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/entity/SarAgenldAcceptButton.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/entity/SarAgenldAcceptButton.java new file mode 100644 index 00000000..3f124323 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/entity/SarAgenldAcceptButton.java @@ -0,0 +1,43 @@ +package com.adc.da.slrs.StandardQA.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import java.util.Date; + +@EqualsAndHashCode(callSuper = false) +@Accessors(chain = true) +@TableName("sar_agenld_accept_button") +@ApiModel(value="SarAgenldAcceptButton对象", description="") +@Data +public class SarAgenldAcceptButton { + + @ApiModelProperty(value = "主键") + @TableId(value = "ID", type = IdType.UUID) + private String id; + + @ApiModelProperty(value = "类型") + @TableField("TASK_ID") + private String taskId; + + @ApiModelProperty(value = "类型") + @TableField("TYPE") + private String type; + + @TableField("CREATE_TIME") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + private Date createTime; + + @TableField("UPDATE_TIME") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + private Date updateTime; + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/service/Impl/SarAgenldAcceptButtonServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/service/Impl/SarAgenldAcceptButtonServiceImpl.java new file mode 100644 index 00000000..2bb02d4b --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/service/Impl/SarAgenldAcceptButtonServiceImpl.java @@ -0,0 +1,43 @@ +package com.adc.da.slrs.StandardQA.service.Impl; + +import com.adc.da.slrs.StandardQA.dao.SarAgenldAcceptButtonDao; +import com.adc.da.slrs.StandardQA.entity.SarAgenldAcceptButton; +import com.adc.da.slrs.StandardQA.service.SarAgenldAcceptButtonService; +import com.adc.da.util.http.ResponseMessage; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; + +@Service +@Transactional(value = "transactionManager", readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Throwable.class) +public class SarAgenldAcceptButtonServiceImpl extends ServiceImpl implements SarAgenldAcceptButtonService { + + @Autowired + private SarAgenldAcceptButtonDao sarAgenldAcceptButtonDao; + + @Override + public String selectIsNot(String pid){ + QueryWrapper objectQueryWrapper = new QueryWrapper<>(); + objectQueryWrapper.eq("TASK_ID",pid); + List sarAgenldAcceptButtons = sarAgenldAcceptButtonDao.selectList(objectQueryWrapper); + if(!sarAgenldAcceptButtons.isEmpty()){ + if(sarAgenldAcceptButtons.get(0).getType().equals("1")){ + return "1"; + } + } + return "0"; + } + + + public void add(String id) { + SarAgenldAcceptButton sarAgenldAcceptButton = new SarAgenldAcceptButton(); + sarAgenldAcceptButton.setTaskId(id); + sarAgenldAcceptButton.setType("1"); + sarAgenldAcceptButtonDao.insert(sarAgenldAcceptButton); + } +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/service/SarAgenldAcceptButtonService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/service/SarAgenldAcceptButtonService.java new file mode 100644 index 00000000..308910b0 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/service/SarAgenldAcceptButtonService.java @@ -0,0 +1,10 @@ +package com.adc.da.slrs.StandardQA.service; + +import com.adc.da.util.http.ResponseMessage; + +public interface SarAgenldAcceptButtonService { + + void add(String id); + + String selectIsNot(String pid); +} diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarAgenIdAcceptButton/SarAgenIdAcceptButtonMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarAgenIdAcceptButton/SarAgenIdAcceptButtonMapper.xml new file mode 100644 index 00000000..585e3510 --- /dev/null +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarAgenIdAcceptButton/SarAgenIdAcceptButtonMapper.xml @@ -0,0 +1,4 @@ + + + +