新舱单辅助管理-转运管理优化权限认证

@@ -11,10 +11,10 @@
         <relativePath/> <!-- lookup parent from repository -->
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
     </parent>
     <groupId>com.tianbo</groupId>
     <groupId>com.tianbo</groupId>
-    <artifactId>analysis</artifactId>
+    <artifactId>nmms</artifactId>
     <version>1.0-SNAPSHOT</version>
     <version>1.0-SNAPSHOT</version>
-    <name>customAnalysis</name>
-    <description>Analysis waybill recept</description>
+    <name>nmms-manage</name>
+    <description>nmms management system</description>
     <properties>
     <properties>
         <druid.version>1.1.9</druid.version>
         <druid.version>1.1.9</druid.version>
         <spring-cloud.version>Greenwich.BUILD-SNAPSHOT</spring-cloud.version>
         <spring-cloud.version>Greenwich.BUILD-SNAPSHOT</spring-cloud.version>

@@ -4,6 +4,7 @@ import com.tianbo.analysis.annotation.UserPermissionCheck;
 import com.tianbo.analysis.model.DOMTRANSIT;
 import com.tianbo.analysis.model.DOMTRANSIT;
 import com.tianbo.analysis.model.ResultJson;
 import com.tianbo.analysis.model.ResultJson;
 import com.tianbo.analysis.service.DomTransitService;
 import com.tianbo.analysis.service.DomTransitService;
+import com.tianbo.analysis.service.ValidateAudit;
 import com.tianbo.analysis.service.ValidateUpdate;
 import com.tianbo.analysis.service.ValidateUpdate;
 import com.tianbo.util.Date.DateUtil;
 import com.tianbo.util.Date.DateUtil;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
@@ -73,9 +74,14 @@ public class DomTransController {
         return new ResultJson<PageInfo<DOMTRANSIT>>("200","success",domTransitService.selectList(domtransit,pageNum,pageSize));
         return new ResultJson<PageInfo<DOMTRANSIT>>("200","success",domTransitService.selectList(domtransit,pageNum,pageSize));
     }
     }
 
 
-    @ApiOperation(value = "预留审核接口",notes = "中转审核")
+    @ApiOperation(value = "审核接口",notes = "中转审核，id及状态必填")
     @PutMapping("audit")
     @PutMapping("audit")
-    public ResultJson audit(){
-        return new ResultJson("200", "ok");
+    @UserPermissionCheck
+    public ResultJson audit(@Validated(ValidateAudit.class) @RequestBody DOMTRANSIT domtransit,
+                            @CookieValue("username") String username,
+                            @CookieValue("userid") String userid){
+        domtransit.setApproverAccount(username);
+        int i = domTransitService.updateByAudit(domtransit);
+        return i >0 ?new ResultJson("200", "审核通过"):new ResultJson("403", "审核失败");
     }
     }
 }
 }

@@ -18,4 +18,6 @@ public interface DOMTRANSITMapper {
     int updateByPrimaryKeySelective(DOMTRANSIT record);
     int updateByPrimaryKeySelective(DOMTRANSIT record);
 
 
     int updateByPrimaryKey(DOMTRANSIT record);
     int updateByPrimaryKey(DOMTRANSIT record);
+
+    int updateByAudit(DOMTRANSIT record);
 }
 }

 package com.tianbo.analysis.model;
 package com.tianbo.analysis.model;
 
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.tianbo.analysis.service.ValidateAudit;
 import com.tianbo.analysis.service.ValidateInsert;
 import com.tianbo.analysis.service.ValidateInsert;
 import com.tianbo.analysis.service.ValidateUpdate;
 import com.tianbo.analysis.service.ValidateUpdate;
 import org.hibernate.validator.constraints.Length;
 import org.hibernate.validator.constraints.Length;
@@ -11,7 +12,7 @@ import java.util.Date;
 
 
 public class DOMTRANSIT {
 public class DOMTRANSIT {
 
 
-    @NotNull(message="类型不能为null",groups= ValidateUpdate.class)
+    @NotNull(message="类型不能为null",groups= {ValidateUpdate.class, ValidateAudit.class})
     private String id;
     private String id;
 
 
     @NotNull(message="类型不能为null",groups= ValidateInsert.class)
     @NotNull(message="类型不能为null",groups= ValidateInsert.class)
@@ -79,6 +80,7 @@ public class DOMTRANSIT {
 
 
     private String userTel;
     private String userTel;
 
 
+    @NotNull(message="审批状态不能为空",groups=ValidateAudit.class)
     private BigDecimal status;
     private BigDecimal status;
 
 
     private String approverAccount;
     private String approverAccount;

@@ -19,4 +19,12 @@ public interface DomTransitService {
     int updateByPrimaryKeySelective(DOMTRANSIT record);
     int updateByPrimaryKeySelective(DOMTRANSIT record);
 
 
     int updateByPrimaryKey(DOMTRANSIT record);
     int updateByPrimaryKey(DOMTRANSIT record);
+
+    /**
+     * 审核
+     * @param record
+     * @return
+     */
+    int updateByAudit(DOMTRANSIT record);
+
 }
 }

+package com.tianbo.analysis.service;
+
+public interface ValidateAudit {
+}

@@ -57,4 +57,9 @@ public class DomtransitServiceImpl implements DomTransitService {
     public int updateByPrimaryKey(DOMTRANSIT record) {
     public int updateByPrimaryKey(DOMTRANSIT record) {
         return domtransitMapper.updateByPrimaryKey(record);
         return domtransitMapper.updateByPrimaryKey(record);
     }
     }
+
+    @Override
+    public int updateByAudit(DOMTRANSIT record) {
+        return domtransitMapper.updateByAudit(record);
+    }
 }
 }

@@ -387,6 +387,15 @@
     </set>
     </set>
     where ID = #{id,jdbcType=VARCHAR}
     where ID = #{id,jdbcType=VARCHAR}
   </update>
   </update>
+  <update id="updateByAudit" parameterType="com.tianbo.analysis.model.DOMTRANSIT" >
+     update DOMTRANSIT
+    <set >
+      <if test="status != null and status!=''" >
+        STATUS = #{status,jdbcType=DECIMAL},
+      </if>
+    </set>
+    where ID = #{id,jdbcType=VARCHAR}
+  </update>
   <update id="updateByPrimaryKey" parameterType="com.tianbo.analysis.model.DOMTRANSIT" >
   <update id="updateByPrimaryKey" parameterType="com.tianbo.analysis.model.DOMTRANSIT" >
     update DOMTRANSIT
     update DOMTRANSIT
     set TRANSIT_TYPE = #{transitType,jdbcType=VARCHAR},
     set TRANSIT_TYPE = #{transitType,jdbcType=VARCHAR},