From 9511184041b4291449496f980fd209aa2984c7a8 Mon Sep 17 00:00:00 2001
From: zhengqiaowen <1275811465@qq.com>
Date: Fri, 18 Nov 2022 09:16:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 inventory-dao/pom.xml                         |  6 ++
 .../com/rzyc/mapper/OADistributionMapper.java |  3 +
 .../com/rzyc/mapper/user/SysUserMapper.java   |  1 +
 .../resources/mapper/OADistributionMapper.xml |  4 ++
 .../main/resources/mapper/OATaskMapper.xml    |  3 +-
 .../com/rzyc/InventoryGovApplication.java     |  3 +
 .../com/rzyc/controller/WorkController.java   | 57 +++++++++++++------
 7 files changed, 59 insertions(+), 18 deletions(-)

diff --git a/inventory-dao/pom.xml b/inventory-dao/pom.xml
index 0b9f38b..11139b6 100644
--- a/inventory-dao/pom.xml
+++ b/inventory-dao/pom.xml
@@ -73,6 +73,12 @@
             <artifactId>spring-boot-starter-validation</artifactId>
             <version>2.2.8.RELEASE</version>
         </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>RELEASE</version>
+            <scope>compile</scope>
+        </dependency>
         <!-- 参数验证 end -->
 
 
diff --git a/inventory-dao/src/main/java/com/rzyc/mapper/OADistributionMapper.java b/inventory-dao/src/main/java/com/rzyc/mapper/OADistributionMapper.java
index 739a4cd..c2f24e3 100644
--- a/inventory-dao/src/main/java/com/rzyc/mapper/OADistributionMapper.java
+++ b/inventory-dao/src/main/java/com/rzyc/mapper/OADistributionMapper.java
@@ -73,4 +73,7 @@ public interface OADistributionMapper extends BaseMapper<OADistribution> {
     List<ImplementationVo> selectImplementation(@Param("deliverDto") DeliverDto deliverDto);
 
     List<NameVo> selectJoinUser(@Param("addWorkDto") AddWorkDto addWorkDto);
+
+    int checkExist(@Param("oataskid") String oataskid,
+                   @Param("sysUserId") String sysUserId);
 }
diff --git a/inventory-dao/src/main/java/com/rzyc/mapper/user/SysUserMapper.java b/inventory-dao/src/main/java/com/rzyc/mapper/user/SysUserMapper.java
index 6cd5d4e..8512bd9 100644
--- a/inventory-dao/src/main/java/com/rzyc/mapper/user/SysUserMapper.java
+++ b/inventory-dao/src/main/java/com/rzyc/mapper/user/SysUserMapper.java
@@ -192,4 +192,5 @@ public interface SysUserMapper {
 
     //查询流转人
     List<UserVo> selectTransferor();
+
 }
diff --git a/inventory-dao/src/main/resources/mapper/OADistributionMapper.xml b/inventory-dao/src/main/resources/mapper/OADistributionMapper.xml
index 732f98e..4855df0 100644
--- a/inventory-dao/src/main/resources/mapper/OADistributionMapper.xml
+++ b/inventory-dao/src/main/resources/mapper/OADistributionMapper.xml
@@ -333,4 +333,8 @@
     on od.SysUserId = su.SysUserId
     where od.OATaskId = #{addWorkDto.oaTaskId}
   </select>
+
+  <select id="checkExist" resultType="int"  parameterType="string">
+      select count(*) from OADistribution  where OADistribution.OATaskId = #{oataskid} and OADistribution.sysUserId = #{sysUserId}
+  </select>
 </mapper>
diff --git a/inventory-dao/src/main/resources/mapper/OATaskMapper.xml b/inventory-dao/src/main/resources/mapper/OATaskMapper.xml
index e882259..ee4365e 100644
--- a/inventory-dao/src/main/resources/mapper/OATaskMapper.xml
+++ b/inventory-dao/src/main/resources/mapper/OATaskMapper.xml
@@ -452,7 +452,7 @@
 
   <!--查询我收到的任务-->
   <select id="getTaskList" resultType="com.rzyc.bean.task.vo.TaskVo">
-    select  ot.OATaskId,oa.OADistributionId,ty.name as taskTypeName,ot.title,u.SysUserName as send_name,u.SysDeptName as unit_name,oa.AppStatus,ot.EndDate as enddate
+    select  ot.OATaskId,oa.OADistributionId,ty.name as taskTypeName,ot.title,u.SysUserName as send_name,u.SysDeptName as unitName,oa.AppStatus,ot.EndDate as enddate
     from OADistribution oa
     left join OATask ot on ot.OATaskId = oa.OATaskId
     left join sysuser u on ot.send_id = u.SysUserId
@@ -525,6 +525,7 @@
       <result column="AppStatus"  property="appStatus"/>
       <result column="CreatedOn"  property="createdOn"/>
       <result column="ModifiedOn"  property="modifiedOn"/>
+      <result column="flow_time"  property="flowTime"/>
     </association>
   </resultMap>
   <!--收到任务详情-->
diff --git a/inventory-gov/src/main/java/com/rzyc/InventoryGovApplication.java b/inventory-gov/src/main/java/com/rzyc/InventoryGovApplication.java
index 00f6c0b..af32998 100644
--- a/inventory-gov/src/main/java/com/rzyc/InventoryGovApplication.java
+++ b/inventory-gov/src/main/java/com/rzyc/InventoryGovApplication.java
@@ -7,12 +7,15 @@ import org.springframework.boot.autoconfigure.data.mongo.MongoDataAutoConfigurat
 import org.springframework.boot.autoconfigure.mongo.MongoAutoConfiguration;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.EnableAspectJAutoProxy;
+import org.springframework.transaction.annotation.EnableTransactionManagement;
+
 /**
  * 政府端
  * @version v1.0
  * @author dong
  * @date 2022/9/16 14:03
  */
+@EnableTransactionManagement
 @Configuration
 @EnableAspectJAutoProxy(proxyTargetClass=true)
 @MapperScan("com.rzyc.mapper")
diff --git a/inventory-gov/src/main/java/com/rzyc/controller/WorkController.java b/inventory-gov/src/main/java/com/rzyc/controller/WorkController.java
index 3196d0d..5738876 100644
--- a/inventory-gov/src/main/java/com/rzyc/controller/WorkController.java
+++ b/inventory-gov/src/main/java/com/rzyc/controller/WorkController.java
@@ -25,6 +25,7 @@ import org.apache.commons.beanutils.converters.SqlDateConverter;
 import org.apache.poi.ss.formula.functions.Na;
 import org.springframework.beans.propertyeditors.CustomDateEditor;
 import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.WebDataBinder;
 import org.springframework.web.bind.annotation.*;
@@ -33,6 +34,7 @@ import javax.validation.Valid;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
+import java.util.Iterator;
 import java.util.List;
 
 /**
@@ -239,7 +241,7 @@ public class WorkController extends BaseController{
         ConvertUtils.register(new DateConverter(null), Date.class);
 
         if (StringUtils.isNotBlank(finishDto.getOadistributionid())){
-            OADistribution oaDistribution = oaDistributionMapper.selectByPrimaryKey(finishDto.getOadistributionid());
+            OADistribution oaDistribution = oaDistributionMapper.selectDistribution(finishDto.getOadistributionid());
             oaDistribution.setSubject(finishDto.getSubject());
             oaDistribution.setTitle(finishDto.getTitle());
             oaDistribution.setStartTime(finishDto.getStartTime());
@@ -292,29 +294,39 @@ public class WorkController extends BaseController{
      * @Author ZQW
      * @CreateTime 2022/10/27 15:34
      */
+    @Transactional
     @ApiOperation(value = "任务流转",position = 12)
     @PostMapping("taskFlow")
     public SingleResult<String> taskFlow(@Valid WorkFlowDto flowDto) throws Exception{
         SingleResult<String> result = new SingleResult<>();
-        OADistribution work = oaDistributionMapper.selectByPrimaryKey(flowDto.getOaDistributionId());
+        OADistribution work = oaDistributionMapper.selectDistribution(flowDto.getOaDistributionId());
 
         String[] sysuid = flowDto.getSysUserId().split(",");
         List<OADistribution> list = new ArrayList<>();
         for (String uid: sysuid) {
-            OADistribution oaDistribution = new OADistribution();
-            oaDistribution.setOadistributionid(RandomNumber.getUUid());
-            oaDistribution.setOataskid(work.getOataskid());
-            //发送人
-            oaDistribution.setSnedId(work.getSysuserid());
-            //接收人
-            oaDistribution.setSysuserid(uid);
-            oaDistribution.setFlowState(1);
-            oaDistribution.setAppstatus("1");
-            oaDistribution.setCreatedby(getUserId());
-            oaDistribution.setCreatedon(new Date());
-            list.add(oaDistribution);
-            System.err.println("插入的内容" + oaDistribution);
+            int num = oaDistributionMapper.checkExist(work.getOataskid(),uid);
+            System.err.println("数量======" + num);
+            if(num <= 0){
+                OADistribution oaDistribution = new OADistribution();
+                oaDistribution.setOadistributionid(RandomNumber.getUUid());
+                oaDistribution.setOataskid(work.getOataskid());
+                //发送人
+                oaDistribution.setSnedId(work.getSysuserid());
+                //接收人
+                oaDistribution.setSysuserid(uid);
+                oaDistribution.setFlowState(1);
+                oaDistribution.setAppstatus("1");
+                oaDistribution.setCreatedby(getUserId());
+                oaDistribution.setCreatedon(new Date());
+                list.add(oaDistribution);
+                System.err.println("插入的内容" + oaDistribution);
+            }else {
+                result.setCode(0);
+                result.setMessage("以流转任务，即将回滚");
+                return result;
+            }
         }
+
         work.setFlowTime(new Date());
         work.setFlowState(2);
         oaDistributionMapper.updateDistriubtion(work);
@@ -328,11 +340,22 @@ public class WorkController extends BaseController{
      */
     @ApiOperation(value = "查询用户",position = 13)
     @GetMapping ("selectUser")
+    @ApiImplicitParams(value = {
+            @ApiImplicitParam(name = "id",value = "登录用户id",required = true)
+    })
     @PreAuthorize("hasAnyAuthority('selectUser','selectUser:update')")
     @MethodAnnotation(authorizations = {"selectUser","selectUser:update"},name = "查询用户")
-    public MultiResult<UserVo> selectUser(){
+    public MultiResult<UserVo> selectUser(@Valid IdDto idDto){
         MultiResult<UserVo> result = new MultiResult();
         List<UserVo> userVoList = sysUserMapper.selectTransferor();
+
+        //移除登录用户
+        for(Iterator<UserVo> iter = userVoList.listIterator(); iter.hasNext();){
+            UserVo next = iter.next();
+            if((idDto.getId().equals(next.getSysuserid()))){
+                iter.remove();
+            }
+        }
         result.setData(userVoList);
         return result;
     }
@@ -404,7 +427,7 @@ public class WorkController extends BaseController{
     @MethodAnnotation(authorizations = {"FlowUserDetail","FlowUserDetail:update"},name = "任务流转人详情")
     public SingleResult<FlowDetailVo> FlowUserDetail(@Valid IdDto idDto){
         SingleResult<FlowDetailVo> result = new SingleResult();
-        OADistribution oaDistribution = oaDistributionMapper.selectByPrimaryKey(idDto.getId());
+        OADistribution oaDistribution = oaDistributionMapper.selectDistribution(idDto.getId());
         if((oaDistribution.getAppstatus().equals("1"))){
             result.setCode(0);
             result.setMessage("该用户未完成任务");