费用推送下拉

bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/mapper/LeaseTaskMapper.java

@@ -368,5 +368,5 @@ public interface LeaseTaskMapper {
      * 查询领用申请三级分类
      * @return
      */
-    List<Type> selectLeaseThreeTypeLease();
+    List<Type> selectLeaseThreeTypeLease(Long deptId);
 }

bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseTaskServiceImpl.java

@@ -1522,7 +1522,8 @@ public class LeaseTaskServiceImpl implements ILeaseTaskService {
      */
     @Override
     public List<Type> getEquipmentThreeTypeLease() {
-        List<Type> maTypes = mapper.selectLeaseThreeTypeLease();
+        Long deptId = typeService.getUserDeptId();
+        List<Type> maTypes = mapper.selectLeaseThreeTypeLease(deptId);
         List<Type> list = new ArrayList<>();
         for (Type maType : maTypes) {
             if (maType.getParentId() == 0) {

bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseTaskMapper.xml

@@ -1372,5 +1372,12 @@
                m.type_name AS label
         FROM ma_type m
         WHERE m.del_flag = '0' and m.is_lease = 0
+        <if test="deptId != null">
+            AND CASE
+            WHEN (#{deptId} = 102 or #{deptId} = 327) THEN m.company_id= 101
+            WHEN  #{deptId} = 309 THEN (m.company_id=#{deptId}) or (m.company_id=101 and m.jiju_type=1)
+            ELSE m.type_id=-1
+            END
+        </if>
     </select>
 </mapper>

bonus-modules/bonus-material/src/main/resources/mapper/material/push/IwsCostPushMapper.xml

@@ -140,7 +140,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
         GROUP BY
             pmc.AGREEMENT_ID, pmc.TYPE
-        order by a.pushStatus,bma.agreement_code
+        order by sd.order_num,a.pushStatus
     </select>
 
     <insert id="insertCalcMonthRecord" parameterType="com.bonus.material.push.domain.IwsCostPushBean" useGeneratedKeys="true" keyProperty="taskId">

bonus-modules/bonus-material/src/main/resources/mapper/material/push/MybatisGenerator.xml

@@ -84,8 +84,11 @@
             <if test="unitId != null and unitId != ''">
                 AND bai.unit_id = #{unitId}
             </if>
+            <if test="impUnitName != null and impUnitName != ''">
+                AND sd.dept_name = #{impUnitName}
+            </if>
         GROUP BY bai.agreement_id
-        order by a.pushStatus
+        order by sd.order_num,a.pushStatus
     </select>
 
     <!-- 获取消耗费用推送审核数据 -->
@@ -146,10 +149,13 @@
             <if test="unitId != null and unitId != ''">
                 AND bu.unit_id = #{unitId}
             </if>
+            <if test="impUnitName != null and impUnitName != ''">
+                AND sd.dept_name = #{impUnitName}
+            </if>
         GROUP BY
             bai.project_id, bai.unit_id
         ORDER BY
-            pmia.push_status
+            sd.order_num,pmia.push_status
     </select>
     
     <update id="updateCostPushCheckStatus" parameterType="java.lang.String">