采购优化

platform-dao/src/main/resources/mapper/longyanpurchaseorder/LongYanPurchaseOrderMapper.xml

@@ -26,56 +26,56 @@
                                      menu.remark
                                 </sql>
     <sql id="List_Condition">
-                                    <if test="id != null and id != ''">
-                    and menu.id = #{id}
-                </if>
-                                                <if test="sbId != null and sbId != ''">
-                    and menu.sb_id = #{sbId}
-                </if>
-                                                <if test="projectId != null and projectId != ''">
-                    and menu.project_id = #{projectId}
-                </if>
-                                                <if test="createdUserId != null and createdUserId != ''">
-                    and menu.created_user_id = #{createdUserId}
-                </if>
-                                                <if test="createdUserName != null and createdUserName != ''">
-                    and menu.created_user_name = #{createdUserName}
-                </if>
-                                                <if test="createdTimeStart != null">
-                    and menu.created_time <![CDATA[>=]]> #{createdTimeStart}
-                </if>
-                <if test="createdTimeEnd != null">
-                    and menu.created_time <![CDATA[<=]]> #{createdTimeEnd}
-                </if>
-                <if test="createdTime != null">
-                    and menu.created_time = #{createdTime}
-                </if>
-                                                <if test="updateTimeStart != null">
-                    and menu.update_time <![CDATA[>=]]>; #{updateTimeStart}
-                </if>
-                <if test="updateTimeEnd != null">
-                    and menu.update_time <![CDATA[<=]]> #{updateTimeEnd}
-                </if>
-                <if test="updateTime != null">
-                    and menu.update_time = #{updateTime}
-                </if>
-                                                <if test="updateUserId != null and updateUserId != ''">
-                    and menu.update_user_id = #{updateUserId}
-                </if>
-                                                <if test="updateUserName != null and updateUserName != ''">
-                    and menu.update_user_name = #{updateUserName}
-                </if>
-                                                <if test="type != null">
-                    and menu.type = #{type}
-                </if>
-                                                <if test="orderName != null and orderName != ''">
-                    and menu.order_name = #{orderName}
-                </if>
-                                                <if test="remark != null and remark != ''">
-                    and menu.remark = #{remark}
-                </if>
-                            <if test="keyword != null and keyword != ''">
-            and menu.id like concat(concat('%',#{keyword}),'%')
+        <if test="id != null and id != ''">
+            and menu.id = #{id}
+        </if>
+        <if test="sbId != null and sbId != ''">
+            and menu.sb_id = #{sbId}
+        </if>
+        <if test="projectId != null and projectId != ''">
+            and menu.project_id = #{projectId}
+        </if>
+        <if test="createdUserId != null and createdUserId != ''">
+            and menu.created_user_id = #{createdUserId}
+        </if>
+        <if test="createdUserName != null and createdUserName != ''">
+            and menu.created_user_name = #{createdUserName}
+        </if>
+        <if test="createdTimeStart != null">
+            and menu.created_time <![CDATA[>=]]> #{createdTimeStart}
+        </if>
+        <if test="createdTimeEnd != null">
+            and menu.created_time <![CDATA[<=]]> #{createdTimeEnd}
+        </if>
+        <if test="createdTime != null">
+            and menu.created_time = #{createdTime}
+        </if>
+        <if test="updateTimeStart != null">
+            and menu.update_time <![CDATA[>=]]>; #{updateTimeStart}
+        </if>
+        <if test="updateTimeEnd != null">
+            and menu.update_time <![CDATA[<=]]> #{updateTimeEnd}
+        </if>
+        <if test="updateTime != null">
+            and menu.update_time = #{updateTime}
+        </if>
+        <if test="updateUserId != null and updateUserId != ''">
+            and menu.update_user_id = #{updateUserId}
+        </if>
+        <if test="updateUserName != null and updateUserName != ''">
+            and menu.update_user_name = #{updateUserName}
+        </if>
+        <if test="type != null">
+            and menu.type = #{type}
+        </if>
+        <if test="orderName != null and orderName != ''">
+            and menu.order_name = #{orderName}
+        </if>
+        <if test="remark != null and remark != ''">
+            and menu.remark = #{remark}
+        </if>
+        <if test="keyword != null and keyword != ''">
+            and menu.created_user_name like concat(concat('%',#{keyword}),'%')
         </if>
         <if test="positionNo != null and positionNo != ''">
             and menu.position_no= #{positionNo}
@@ -96,14 +96,16 @@
             and menu.yongYouId = #{yongYouId}
         </if>
     </sql>
-    <select id="selectList" parameterType="com.platform.dao.dto.longyanpurchaseorder.LongYanPurchaseOrderDTO" resultType="com.platform.dao.vo.query.longyanpurchaseorder.LongYanPurchaseOrderVO">
-        select menu.*,project.name as projectName,project2.name as parentProjectName,info.name as sbName,info.position_no as positionNo
+    <select id="selectList" parameterType="com.platform.dao.dto.longyanpurchaseorder.LongYanPurchaseOrderDTO"
+            resultType="com.platform.dao.vo.query.longyanpurchaseorder.LongYanPurchaseOrderVO">
+        select menu.*,project.name as projectName,project2.name as parentProjectName,info.name as
+        sbName,info.position_no as positionNo
         from t_long_yan_purchase_order as menu
         left join t_sb_info info on info.id = menu.sb_id
         left join t_project project on project.id = menu.project_id
         left join t_project project2 on project.parent_id = project2.id
         <where>
-            <include refid="List_Condition" />
+            <include refid="List_Condition"/>
         </where>
     </select>
 
@@ -112,7 +114,7 @@
         select type as purchaseType,count(1) as orderTotalNum,sum(total_num) as spareTotalNum
         from t_long_yan_purchase_order as menu
         <where>
-            <include refid="List_Condition" />
+            <include refid="List_Condition"/>
         </where>
         group by type
     </select>
@@ -134,7 +136,7 @@
             parameterType="com.platform.dao.dto.longyanpurchaseorder.LongYanPurchaseOrderDTO">
         select count(1) from t_long_yan_purchase_order menu
         <where>
-            <include refid="List_Condition" />
+            <include refid="List_Condition"/>
         </where>
     </select>
 
@@ -143,7 +145,7 @@
         select cptCode as type,count(1) as num
         from t_long_yan_purchase_order
         <where>
-            <include refid="List_Condition" />
+            <include refid="List_Condition"/>
         </where>
         group by
         cptCode
@@ -153,7 +155,7 @@
         select cbustype as type,count(1) as num
         from t_long_yan_purchase_order
         <where>
-            <include refid="List_Condition" />
+            <include refid="List_Condition"/>
         </where>
         group by
         cbustype
@@ -163,7 +165,7 @@
         select old_or_new as type,count(1) as num
         from t_long_yan_purchase_order
         <where>
-            <include refid="List_Condition" />
+            <include refid="List_Condition"/>
         </where>
         group by
         old_or_new
@@ -173,7 +175,7 @@
         select cdepcode as type,count(1) as num
         from t_long_yan_purchase_order
         <where>
-            <include refid="List_Condition" />
+            <include refid="List_Condition"/>
         </where>
         group by
         cdepcode
@@ -183,7 +185,7 @@
         <foreach collection="list" item="item" index="index" open="" close="" separator=";">
             update t_long_yan_purchase_order orders
 
-            <set>  orders.`status` = #{item.status}
+            <set>orders.`status` = #{item.status}
 
             </set>
             where orders.yong_you_id = #{item.yongYouId}

platform-service/src/main/java/com/platform/service/longyanpurchaseorder/impl/LongYanPurchaseOrderServiceImpl.java

@@ -392,7 +392,6 @@ public class LongYanPurchaseOrderServiceImpl extends BaseServiceImpl<LongYanPurc
         for (LongYanPurchaseOrderVO vo:longYanPurchaseOrderVOS){
             vo.setComplateProjectName(vo.getParentProjectName()+"->"+vo.getProjectName());
         }
-
         return new MyPage(longYanPurchaseOrderVOS);
     }
 

platform-service/src/main/java/com/platform/service/sb/impl/SbInfoServiceImpl.java

@@ -1746,6 +1746,9 @@ public class SbInfoServiceImpl extends BaseServiceImpl<SbInfoMapper, SbInfo, SbI
             }
             model.setUseCompany(list.get(0).getDeptId());
         }
+        if(StringUtils.isNotBlank(model.getFinancingNo())){
+            model.setFinancingNo(model.getFinancingNo().trim());
+        }
         PageHelper.startPage(pageNum, pageSize);
         List<SbInfoVO> sbList = mapper.selectVOList(model);
         if (model.getUseType()!=null&&model.getUseType()==5){