修改

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/CustomerInfoController.java

@@ -36,7 +36,7 @@ public class CustomerInfoController {
      * @return
      */
     @PostMapping("/api/editCustomerInfo")
-    public String editCustomerInfo(CustomerInfo customerInfo){
+    public String editCustomerInfo(@RequestBody CustomerInfo customerInfo){
         return customerInfoService.editCustomerInfo(customerInfo);
     }
     /**

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/DriverViewInfoController.java

@@ -122,12 +122,12 @@ public class DriverViewInfoController {
     }
     /**
      * 审核
-     * @param id
+     * @param driverViewInfo
      * @return
      */
     @PostMapping("/api/examine")
-    public String examine(String id,Integer flag){
-        return driverViewInfoService.examine(id,flag);
+    public String examine(@RequestBody DriverViewInfo driverViewInfo){
+        return driverViewInfoService.examine(driverViewInfo);
 
     }
 }

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/IdentityAuthenticationInfoController.java

@@ -100,12 +100,12 @@ public class IdentityAuthenticationInfoController {
     }
     /**
      * 审核
-     * @param id
+     * @param identityAuthenticationInfo
      * @return
      */
     @PostMapping("/api/examine")
-    public String examine(String id,Integer flag){
-        return iIdentityAuthenticationInfoService.examine(id,flag);
+    public String examine(@RequestBody IdentityAuthenticationInfo identityAuthenticationInfo){
+        return iIdentityAuthenticationInfoService.examine(identityAuthenticationInfo);
     }
 
     /**

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/ProcurementPlanInfoController.java

@@ -85,12 +85,12 @@ public class ProcurementPlanInfoController {
     }
     /**
      * 审核
-     * @param id
+     * @param procurementPlanInfo
      * @return
      */
     @PostMapping("/api/examine")
-    public String examine(String id,Integer flag){
-        return procurementPlanInfoService.examine(id,flag);
+    public String examine(@RequestBody ProcurementPlanInfo procurementPlanInfo){
+        return procurementPlanInfoService.examine(procurementPlanInfo);
 
     }
 

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/DriverViewInfo.java

@@ -94,6 +94,11 @@ public class DriverViewInfo extends BaseModel<DriverViewInfo> {
      */
     @TableField(exist = false)
     private String pcFlag;
+    /**
+     * 通过1驳回2
+     */
+    @TableField(exist = false)
+    private Integer flag;
 
     /**
      * 模糊查询

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/IdentityAuthenticationInfo.java

@@ -121,6 +121,11 @@ public class IdentityAuthenticationInfo extends BaseModel<IdentityAuthentication
      * 用户id
      */
     private String commonId;
+    /**
+     * 通过1驳回2
+     */
+    @TableField(exist = false)
+    private Integer flag;
 
     /**
      * 查询类型

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/ProcurementPlanInfo.java

@@ -234,6 +234,11 @@ public class ProcurementPlanInfo extends BaseModel<ProcurementPlanInfo> {
      * PC端(传1)
      */
     private String pcFlag;
+    /**
+     * 通过1驳回2
+     */
+    @TableField(exist = false)
+    private Integer flag;
 
 
 

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/IDriverViewInfoService.java

@@ -69,11 +69,10 @@ public interface IDriverViewInfoService extends IService<DriverViewInfo> {
     DriverCarInfo selectDriverDetail(String id);
     /**
      * 审核
-     * @param id
-     * @param flag 1通过 2 驳回
+     * @param driverViewInfo
      * @return
      */
-    String examine(String id,Integer flag);
+    String examine(DriverViewInfo driverViewInfo);
 
 
 }

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/IIdentityAuthenticationInfoService.java

@@ -57,11 +57,10 @@ public interface IIdentityAuthenticationInfoService extends IService<IdentityAut
     IdentityAuthenticationInfo getInfo(String commonId) throws ServiceException;
     /**
      * 审核
-     * @param id
-     * @param flag 1通过 2 驳回
+     * @param identityAuthenticationInfo
      * @return
      */
-    String examine(String id,Integer flag);
+    String examine(IdentityAuthenticationInfo identityAuthenticationInfo);
     /**
      * 设置默认
      * @param identityAuthenticationInfo

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/IProcurementPlanInfoService.java

@@ -56,10 +56,9 @@ public interface IProcurementPlanInfoService extends IService<ProcurementPlanInf
 
     /**
      * 审核
-     * @param id
-     * @param flag 1通过 2 驳回
+     * @param procurementPlanInfo
      * @return
      */
-    String examine(String id,Integer flag);
+    String examine(ProcurementPlanInfo procurementPlanInfo);
 
 }

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/DriverViewInfoServiceImpl.java

@@ -305,17 +305,15 @@ public class DriverViewInfoServiceImpl extends ServiceImpl<DriverViewInfoMapper,
 
     /**
      * 审核
-     * @param id
-     * @param flag 1通过 2 驳回
+     * @param driverViewInfo
      * @return
      */
     @Override
-    public String examine(String id, Integer flag) {
+    public String examine(DriverViewInfo driverViewInfo) {
         //查询司机列表
-        DriverViewInfo driverViewInfo = this.selectById(id);
         if (driverViewInfo != null ){
             //通过
-            if(flag==1){
+            if("1".equals(driverViewInfo.getFlag())){
                 driverViewInfo.setAuthenticationStatusKey(StatusEnum.IDENTITY_COMPLETED.getFlag());
                 driverViewInfo.setAuthenticationStatus(StatusEnum.IDENTITY_COMPLETED.getName());
             }

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/IdentityAuthenticationInfoServiceImpl.java

@@ -188,17 +188,15 @@ public class IdentityAuthenticationInfoServiceImpl extends ServiceImpl<IdentityA
 
     /**
      * 审核
-     * @param id
-     * @param flag 1通过 2 驳回
+     * @param identityAuthenticationInfo
      * @return
      */
     @Override
-    public String examine(String id, Integer flag) {
+    public String examine(IdentityAuthenticationInfo identityAuthenticationInfo) {
         //查询粮商列表
-        IdentityAuthenticationInfo identityAuthenticationInfo = this.selectById(id);
-        if (!StringUtils.isEmpty(identityAuthenticationInfo.getId())){
+        if (identityAuthenticationInfo!=null){
             //通过
-            if(flag==1){
+            if("1".equals(identityAuthenticationInfo.getFlag())){
                 identityAuthenticationInfo.setAuthenticationStatusKey(StatusEnum.IDENTITY_COMPLETED.getFlag());
                 identityAuthenticationInfo.setAuthenticationStatus(StatusEnum.IDENTITY_COMPLETED.getName());
             }
@@ -225,7 +223,7 @@ public class IdentityAuthenticationInfoServiceImpl extends ServiceImpl<IdentityA
                 .eq("common_id",identityAuthenticationInfo.getCommonId())
                 .eq(IdentityAuthenticationInfo.QueryFiles.DELETE_FLAG, NumberConstant.CONSTANT0)
                 .eq(IdentityAuthenticationInfo.QueryFiles.DEFAULT_FLAG,NumberConstant.CONSTANT1));
-        if(!StringUtils.isEmpty(identityAuthenticationInfo1.getId())){
+        if(identityAuthenticationInfo1!=null){
             //取消默认
             identityAuthenticationInfo1.setDefaultFlag("0");
             this.updateById(identityAuthenticationInfo1);

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/ProcurementPlanInfoServiceImpl.java

@@ -178,17 +178,15 @@ public class ProcurementPlanInfoServiceImpl extends ServiceImpl<ProcurementPlanI
 
     /**
      * 审核
-     * @param id
-     * @param flag 1通过 2 驳回
+     * @param procurementPlanInfo
      * @return
      */
     @Override
-    public String examine(String id,Integer flag) {
+    public String examine(ProcurementPlanInfo procurementPlanInfo) {
         //查询采购计划列表
-        ProcurementPlanInfo procurementPlanInfo = this.selectById(id);
         if (procurementPlanInfo != null ){
             //通过
-            if(flag==1){
+            if("1".equals(procurementPlanInfo.getFlag())){
                 procurementPlanInfo.setStatusFlag(StatusEnum.ORDER_PASSED.getFlag());
                 procurementPlanInfo.setStatus(StatusEnum.ORDER_PASSED.getName());
                 geTuiUtils.pushByCid("审核通知","您申请的交易已审核通过",procurementPlanInfo.getCommonId());