Parcourir la source

事业部 绑定加工计费标准id

24282 il y a 1 an
Parent
commit
6de04638a4

+ 6 - 0
sd-business/src/main/java/com/sd/business/entity/department/dto/DepartmentSelectDto.java

@@ -29,4 +29,10 @@ public class DepartmentSelectDto extends BaseSelectDto {
      */
      */
     private String contactPerson;
     private String contactPerson;
 
 
+    /**
+     * 加工计费标准id
+     */
+    private Long priceBillingStandardId;
+
+
 }
 }

+ 5 - 0
sd-business/src/main/java/com/sd/business/entity/department/vo/DepartmentVo.java

@@ -19,4 +19,9 @@ public class DepartmentVo extends Department {
      */
      */
     private String priceSystemName;
     private String priceSystemName;
 
 
+    /**
+     * 加工计费标准名称
+     */
+    private String priceBillingStandardName;
+
 }
 }

+ 1 - 0
sd-business/src/main/java/com/sd/business/service/department/impl/DepartmentServiceImpl.java

@@ -54,6 +54,7 @@ public class DepartmentServiceImpl extends ServiceImpl<DepartmentMapper, Departm
         wrapper.like("d", Department::getName, dto.getName());
         wrapper.like("d", Department::getName, dto.getName());
         wrapper.eq("d", Department::getPriceSystemId, dto.getPriceSystemId());
         wrapper.eq("d", Department::getPriceSystemId, dto.getPriceSystemId());
         wrapper.like("d", Department::getContactPerson, dto.getContactPerson());
         wrapper.like("d", Department::getContactPerson, dto.getContactPerson());
+        wrapper.eq("d", Department::getPriceBillingStandardId, dto.getPriceBillingStandardId());
         Page<DepartmentVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
         Page<DepartmentVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
         return page;
         return page;
     }
     }

+ 4 - 1
sd-business/src/main/resources/mapper/department/DepartmentMapper.xml

@@ -23,9 +23,12 @@
                d.create_time,
                d.create_time,
                d.update_user,
                d.update_user,
                d.update_time,
                d.update_time,
-               ps.name priceSystemName
+               ps.name  priceSystemName,
+               d.price_billing_standard_id,
+               pbs.name priceBillingStandardName
         from department d
         from department d
                  left join price_system ps on d.price_system_id = ps.id
                  left join price_system ps on d.price_system_id = ps.id
+                 left join price_billing_standard pbs on d.price_billing_standard_id = pbs.id
             ${ew.customSqlSegment}
             ${ew.customSqlSegment}
     </select>
     </select>