1.粮脉动态头像2.船运按集装箱个数插入条数3.模糊查询

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

@@ -109,6 +109,12 @@ public class SettledCompanyDynamics extends BaseModel<SettledCompanyDynamics> {
      */
     @TableField(exist = false)
     private String userName;
+    /**
+     * 头像
+     */
+    @TableField(exist = false)
+    private String avatarUrl;
+
 
 
     /**

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

@@ -91,30 +91,6 @@ public class PurchasePriceServiceImpl extends ServiceImpl<PurchasePriceMapper, P
             purchasePrice.setStatusFlag(StatusEnum.PURCHASE_REVIEWED.getFlag());
             // 操作主表数据
             this.insert(purchasePrice);
-            boolean isStartWorkflow = StringUtils.isBlank(purchasePrice.getWorkflowId());
-            // 不是退回的单子
-            if (isStartWorkflow) {
-                Workflow workflow = workflowService
-                        .findLatestWorkflowByBusinessCodeByApp(purchasePrice.getCompId(), "PROCUREMENT-PRICE-APPROVE");
-                // 没配置审核流程，直接结束并处理信息
-                if (workflow == null) {
-                    throw new YException(YExceptionEnum.PURCHASE_ORDER_ERROR);
-                }
-                // 开启审核流
-                else {
-
-                    // 设置状态 已提交审核
-                    purchasePrice.setWorkflowId(workflow.getId());
-                    this.updateById(purchasePrice);
-                    workflowService.startInstance(workflow.getId(), purchasePrice.getId());
-                }
-            }
-            // 退回的单子 再启用
-            else {
-
-                this.updateById(purchasePrice);
-                workflowService.activateInstance(purchasePrice.getWorkflowId(), purchasePrice.getId());
-            }
 
             // 操作明细表数据
             for(PurchasePriceDetail tmp : purchasePrice.getDetails()){
@@ -134,8 +110,31 @@ public class PurchasePriceServiceImpl extends ServiceImpl<PurchasePriceMapper, P
         }
         catch (Exception e){
             System.out.println("新增收购价格异常："+e.toString());
-            return "error";
         }
+        boolean isStartWorkflow = StringUtils.isBlank(purchasePrice.getWorkflowId());
+        // 不是退回的单子
+        if (isStartWorkflow) {
+            Workflow workflow = workflowService
+                    .findLatestWorkflowByBusinessCodeByApp(purchasePrice.getCompId(), "PROCUREMENT-PRICE-APPROVE");
+            // 没配置审核流程，直接结束并处理信息
+            if (workflow == null) {
+                throw new YException(YExceptionEnum.PURCHASE_ORDER_ERROR);
+            }
+            // 开启审核流
+            else {
+
+                // 设置状态 已提交审核
+                purchasePrice.setWorkflowId(workflow.getId());
+                this.updateById(purchasePrice);
+                workflowService.startInstance(workflow.getId(), purchasePrice.getId());
+            }
+        }
+        // 退回的单子 再启用
+        else {
+            this.updateById(purchasePrice);
+            workflowService.activateInstance(purchasePrice.getWorkflowId(), purchasePrice.getId());
+        }
+        return "ok";
     }
 
     @Override

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

@@ -65,6 +65,8 @@ public class SettledCompanyDynamicsServiceImpl extends ServiceImpl<SettledCompan
                 if (commonUser != null) {
                     //昵称
                     settledCompanyDynamics1.setUserName(commonUser.getUserName());
+                    //头像
+                    settledCompanyDynamics1.setAvatarUrl(commonUser.getAvatarUrl()!=null?commonUser.getAvatarUrl():"");
                 }
             }
         }
@@ -176,6 +178,11 @@ public class SettledCompanyDynamicsServiceImpl extends ServiceImpl<SettledCompan
     public SettledCompanyDynamics getSettledCompanyDynamics(String id) {
         //查看信息
         SettledCompanyDynamics settledCompanyDynamics = this.selectById(id);
+        CommonUser commonUser = commonUserService.selectOne(new EntityWrapper<CommonUser>().eq("phone", settledCompanyDynamics.getPhone()));
+        if (commonUser != null) {
+            //头像
+            settledCompanyDynamics.setAvatarUrl(commonUser.getAvatarUrl()!=null?commonUser.getAvatarUrl():"");
+        }
         return settledCompanyDynamics;
     }
 

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

@@ -160,19 +160,30 @@ public class TranProcessInfoServiceImpl extends ServiceImpl<TranProcessInfoMappe
                 }
                 //新增
                 if (StringUtils.isEmpty(tranCarInfo.getId())) {
-                    tranCarInfo.setProcessId(tranProcessInfo.getId());
-                    tranCarInfo.setInfoId(tranProcessInfo.getInfoId());
-                    tranCarInfo.setId(IdGenerator.generateUUID());
-                    if (!NumberConstant.CONSTANT1.equals(tranCarInfo.getTemporaryDriverFlag()) && tranCarInfo.getLoadNetWeight() > 0) {
-                        tranCarInfo.setSignStatus(StatusEnum.NOT_SIGNED.getName());
-                        tranCarInfo.setSignStatusFlag(StatusEnum.NOT_SIGNED.getFlag());
+                    //船运集装箱
+                    if (tranCarInfoList.get(0).getTranType().equals(NumberConstant.CONSTANT3)&&"集装箱".equals(tranCarInfoList.get(0).getShipType())) {
+                        for(int i=0;i<tranCarInfoList.get(0).getBoxNumber();i++){
+                            tranCarInfo.setProcessId(tranProcessInfo.getId());
+                            tranCarInfo.setInfoId(tranProcessInfo.getInfoId());
+                            tranCarInfo.setId(IdGenerator.generateUUID());
+                            tranCarInfoService.insert(tranCarInfo);
+                        }
                     }
-                    //汽运类型
-                    if (tranCarInfo.getTranType().equals(NumberConstant.CONSTANT1)) {
-                        tranCarInfo.setStatusFlag(StatusEnum.NOT_LOADED.getFlag());
-                        tranCarInfo.setStatus(StatusEnum.NOT_LOADED.getName());
+                    else {
+                        tranCarInfo.setProcessId(tranProcessInfo.getId());
+                        tranCarInfo.setInfoId(tranProcessInfo.getInfoId());
+                        tranCarInfo.setId(IdGenerator.generateUUID());
+                        if (!NumberConstant.CONSTANT1.equals(tranCarInfo.getTemporaryDriverFlag()) && tranCarInfo.getLoadNetWeight() > 0) {
+                            tranCarInfo.setSignStatus(StatusEnum.NOT_SIGNED.getName());
+                            tranCarInfo.setSignStatusFlag(StatusEnum.NOT_SIGNED.getFlag());
+                        }
+                        //汽运类型
+                        if (tranCarInfo.getTranType().equals(NumberConstant.CONSTANT1)) {
+                            tranCarInfo.setStatusFlag(StatusEnum.NOT_LOADED.getFlag());
+                            tranCarInfo.setStatus(StatusEnum.NOT_LOADED.getName());
+                        }
+                        tranCarInfoService.insert(tranCarInfo);
                     }
-                    tranCarInfoService.insert(tranCarInfo);
                 }
                 //编辑
                 else {
@@ -282,6 +293,20 @@ public class TranProcessInfoServiceImpl extends ServiceImpl<TranProcessInfoMappe
                         tranCarInfo.setStatusFlag(StatusEnum.DELIVERED.getFlag());
                         tranCarInfo.setStatus(StatusEnum.DELIVERED.getName());
                     }
+                    //船运集装箱
+                    if (tranCarInfoList.get(0).getTranType().equals(NumberConstant.CONSTANT3)&&"集装箱".equals(tranCarInfoList.get(0).getShipType())) {
+                       //查到一个阶段下的集装箱信息
+                        List<TranCarInfo> tranCarInfos=tranCarInfoService.selectList(new EntityWrapper<TranCarInfo>()
+                       .eq("process_id",tranCarInfo.getProcessId()));
+                       if (!CollectionUtils.isEmpty(tranCarInfos)){
+                          for (TranCarInfo tranCarInfo1:tranCarInfos){
+                              tranCarInfo1.setShipName(tranCarInfo.getShipName());
+                              tranCarInfo1.setShipNo(tranCarInfo.getShipNo());
+                              //更新
+                              tranCarInfoService.updateById(tranCarInfo1);
+                          }
+                       }
+                    }
                     tranCarInfoService.updateById(tranCarInfo);
                 }
             }

winsea-haixin-plugin-yiliangyiyun/src/main/resources/mapper/SettledCompanyInfoMapper.xml

@@ -46,7 +46,7 @@
             AND (lower(detailed_address) like lower(CONCAT('%',#{detailedAddress},'%')))
         </if>
         <if test="mainBusinessType != null and mainBusinessType != ''">
-            AND main_business_type = #{mainBusinessType}
+            AND (lower(main_business_type) like lower(CONCAT('%',#{mainBusinessType},'%')))
         </if>
     </select>
 
@@ -111,7 +111,7 @@
             AND (lower(detailed_address) like lower(CONCAT('%',#{detailedAddress},'%')))
         </if>
         <if test="mainBusinessType != null and mainBusinessType != ''">
-            AND main_business_type = #{mainBusinessType}
+            AND (lower(main_business_type) like lower(CONCAT('%',#{mainBusinessType},'%')))
         </if>
         ORDER BY status_flag asc , update_date DESC
         <if test="currentPage != null and currentPage != ''">