1231

src/main/java/cn/ezhizao/project/business/supplier/controller/BizSupplierController.java

@@ -10,6 +10,7 @@ import cn.ezhizao.project.business.outsourceBalanceAccount.domain.BizOutsourceBa
 import cn.ezhizao.project.business.outsourceBalanceAccount.service.IBizOutsourceBalanceAccountService;
 import cn.ezhizao.project.business.supplier.domain.*;
 import cn.ezhizao.project.business.supplier.service.*;
+import cn.ezhizao.project.system.domain.SysDept;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import org.springframework.web.bind.annotation.*;
@@ -62,6 +63,20 @@ public class BizSupplierController extends BaseController {
         return getDataTable(list);
     }
 
+    @Log(title = "外协工段选择外协商单位", businessType = BusinessType.SELECT)
+    @GetMapping("/listByDept")
+    public TableDataInfo listByDept(SysDept dept) throws NoSuchFieldException, IllegalAccessException, JsonProcessingException {
+
+        startPage();
+        List<BizSupplier> list = iBizSupplierService.getListByDept(dept);
+        return getDataTable(list);
+    }
+    @GetMapping(value = "/getOutsourceDept")
+    @Log(title = "查询内部外协工段", businessType = BusinessType.SELECT)
+    public AjaxResult getOutsourceDept(BizSupplier supplier) {
+        return success(iBizSupplierService.getOutsourceDept(supplier));
+    }
+
     /**
      * 获取外协商详细信息
      */

src/main/java/cn/ezhizao/project/business/supplier/domain/BizSupplier.java

@@ -65,4 +65,8 @@ public class BizSupplier extends BaseEntity {
     @TableField(exist = false)
     private String contactPhoneNumber;
     private BigDecimal freightPrice;
+    @TableField(exist = false)
+    private Long outsourceDeptId;
+    @TableField(exist = false)
+    private String outsourceDeptName;
 }

src/main/java/cn/ezhizao/project/business/supplier/mapper/BizSupplierMapper.java

@@ -2,6 +2,7 @@ package cn.ezhizao.project.business.supplier.mapper;
 
 import cn.ezhizao.project.business.supplier.domain.BizSupplier;
 import cn.ezhizao.project.business.supplier.domain.BizSupplierUser;
+import cn.ezhizao.project.system.domain.SysDept;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 import java.util.List;
@@ -24,4 +25,6 @@ public interface BizSupplierMapper extends BaseMapper<BizSupplier> {
     public int physicalDelete(BizSupplier bizSupplier);
 
     public List<BizSupplier> getList(BizSupplier data);
+    public List<BizSupplier> getListByDept(SysDept data);
+    public List<BizSupplier> getOutsourceDept(BizSupplier data);
 }

src/main/java/cn/ezhizao/project/business/supplier/service/IBizSupplierService.java

@@ -2,6 +2,7 @@ package cn.ezhizao.project.business.supplier.service;
 
 import cn.ezhizao.project.business.supplier.domain.BizSupplier;
 import cn.ezhizao.project.business.supplier.domain.BizSupplierUser;
+import cn.ezhizao.project.system.domain.SysDept;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.util.List;
@@ -24,4 +25,6 @@ public interface IBizSupplierService extends IService<BizSupplier> {
     int physicalDelete(BizSupplier bizCarrier);
 
     List<BizSupplier> getList(BizSupplier data);
+    List<BizSupplier> getListByDept(SysDept data);
+    List<BizSupplier> getOutsourceDept(BizSupplier data);
 }

src/main/java/cn/ezhizao/project/business/supplier/service/impl/BizSupplierServiceImpl.java

@@ -4,6 +4,7 @@ import cn.ezhizao.project.business.supplier.domain.BizSupplier;
 import cn.ezhizao.project.business.supplier.domain.BizSupplierUser;
 import cn.ezhizao.project.business.supplier.mapper.BizSupplierMapper;
 import cn.ezhizao.project.business.supplier.service.IBizSupplierService;
+import cn.ezhizao.project.system.domain.SysDept;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
@@ -39,4 +40,14 @@ public class BizSupplierServiceImpl extends ServiceImpl<BizSupplierMapper, BizSu
         return bizSupplierMapper.getList(data);
     }
 
+    @Override
+    public List<BizSupplier> getListByDept(SysDept data) {
+        return bizSupplierMapper.getListByDept(data);
+    }
+
+    @Override
+    public List<BizSupplier> getOutsourceDept(BizSupplier data) {
+        return bizSupplierMapper.getOutsourceDept(data);
+    }
+
 }

src/main/java/cn/ezhizao/project/system/domain/SysDept.java

@@ -191,6 +191,34 @@ public class SysDept extends BaseEntity {
     @TableField(exist = false)
     private Long dayworkId;
     private Integer isCentralizedTurnover;
+    private Integer isOutsourcing;
+    private Long supplierId;
+    @TableField(exist =false)
+    private String supplierName;
+
+    public String getSupplierName() {
+        return supplierName;
+    }
+
+    public void setSupplierName(String supplierName) {
+        this.supplierName = supplierName;
+    }
+
+    public Integer getIsOutsourcing() {
+        return isOutsourcing;
+    }
+
+    public void setIsOutsourcing(Integer isOutsourcing) {
+        this.isOutsourcing = isOutsourcing;
+    }
+
+    public Long getSupplierId() {
+        return supplierId;
+    }
+
+    public void setSupplierId(Long supplierId) {
+        this.supplierId = supplierId;
+    }
 
     public Integer getIsCentralizedTurnover() {
         return isCentralizedTurnover;

src/main/resources/mybatis/business/supplier/BizSupplierMapper.xml

@@ -35,6 +35,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </trim>
 
     </select>
+    <select id="getListByDept" resultMap="BizSupplierResult">
+        select * from biz_supplier where id not in (select supplier_id from sys_dept where del_flag = 0 and dept_id != #{deptId} )
+        and deleted = 0
+    </select>
+    <select id="getOutsourceDept" resultMap="BizSupplierResult">
+        select t2.*,t1.dept_id as outsourceDeptId,t1.dept_name as outsourceDeptName from sys_dept t1 left join biz_supplier t2 on t1.supplier_id = t2.id where
+        t1.is_outsourcing = 1 and t1.del_flag = 0 and t2.deleted = 0
+    </select>
 
     <delete id="physicalDelete">
         DELETE FROM biz_supplier

src/main/resources/mybatis/system/SysDeptMapper.xml

@@ -141,7 +141,9 @@
 
 	<select id="selectDeptById" parameterType="Long" resultMap="SysDeptResult">
 		select d.type,d.dept_id,d.is_work_section,d.is_sort_packaging,d.tenant_id,d.parent_id, d.ancestors, d.dept_name,d.dept_code, d.order_num, d.phone, d.email, d.status,d.equiment_flag,d.auto_allocation,
-			   (select dept_name from sys_dept where dept_id = d.parent_id) parent_name
+		d.supplier_id,d.is_outsourcing,
+			   (select dept_name from sys_dept where dept_id = d.parent_id) parent_name,
+				(select name from biz_supplier where id = d.supplier_id) supplier_name
 		from sys_dept d
 		where d.dept_id = #{deptId}
 	</select>
@@ -196,6 +198,8 @@
 		<if test="phone != null and phone != ''">phone,</if>
 		<if test="email != null and email != ''">email,</if>
 		<if test="status != null">status,</if>
+		<if test="isOutsourcing != null">is_outsourcing,</if>
+		<if test="supplierId != null">supplier_id,</if>
 		<if test="createBy != null and createBy != ''">create_by,</if>
 		<if test="type != null ">type,</if>
 		create_time
@@ -214,6 +218,8 @@
 		<if test="phone != null and phone != ''">#{phone},</if>
 		<if test="email != null and email != ''">#{email},</if>
 		<if test="status != null">#{status},</if>
+		<if test="isOutsourcing != null">#{isOutsourcing},</if>
+		<if test="supplierId != null">#{supplierId},</if>
 		<if test="createBy != null and createBy != ''">#{createBy},</if>
 		<if test="type != null">#{type},</if>
 		sysdate()
@@ -237,6 +243,8 @@
 			<if test="phone != null">phone = #{phone},</if>
 			<if test="email != null">email = #{email},</if>
 			<if test="status != null and status != ''">status = #{status},</if>
+			<if test="isOutsourcing != null">is_outsourcing = #{isOutsourcing},</if>
+			<if test="supplierId != null">supplier_id = #{supplierId},</if>
 			<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
 			<if test="type != null">type = #{type},</if>
 			update_time = sysdate()