Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorFeign.java

@@ -79,6 +79,9 @@ public interface BaseDistributorFeign {
     @GetMapping("/getBaseDistributorList")
     ResultBean<List<PcBaseDistributorVo>> getBaseDistributorList(@SpringQueryMap PcBaseDistributorQuery query);
 
+    @ApiOperation("PC端-销售订单-经销商列表")
+    @PostMapping("/getDistributors")
+    ResultBean<List<BaseDistributorsListVo>> getDistributors(@RequestBody BaseDistributorsListQuery pagerQuery);
     //---------------------------------------移动端-------------------------------------------------//
 
     @ApiOperation("移动端-销售订单-经销商分页列表")

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorFeignFallback.java

@@ -77,6 +77,11 @@ public class BaseDistributorFeignFallback implements BaseDistributorFeign {
         return null;
     }
 
+    @Override
+    public ResultBean<List<BaseDistributorsListVo>> getDistributors(BaseDistributorsListQuery pagerQuery) {
+        return null;
+    }
+
     @Override
     public ResultBean<PagerVo<BaseDistributorsListVo>> getDistributorList(PagerQuery<BaseDistributorsListQuery> pagerQuery) {
         return null;

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerFeign.java

@@ -161,6 +161,11 @@ public interface BaseManufacturerFeign {
     @ResponseBody
     ResultBean<List<Map<String, Object>>> namesDown(@RequestParam(value = "name", required = false) String name);
 
+    @GetMapping("/selectByZjcAndUseOrgIsNull")
+    @ApiOperation(value = "品牌根据主机厂和使用组织为空查询厂商信息")
+    @ResponseBody
+    ResultBean<List<Map<String, Object>>> selectByZjcAndUseOrgIsNull();
+
     @ApiOperation("手机端根据使用orgSid查询生产厂商列表")
     @ResponseBody
     @PostMapping("/selectAppListByOrgSid")

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerFeignFallback.java

@@ -86,6 +86,11 @@ public class BaseManufacturerFeignFallback implements BaseManufacturerFeign {
         return null;
     }
 
+    @Override
+    public ResultBean<List<Map<String, Object>>> selectByZjcAndUseOrgIsNull() {
+        return null;
+    }
+
     @Override
     public ResultBean selectAppListByOrgSid(PagerQuery<BaseManufactureSelectQuery> query) {
         return ResultBean.fireFail().setMsg("接口anrui-base/basemanufacturer/selectAppListByOrgSid无法访问");

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorMapper.java

@@ -6,10 +6,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.yxt.anrui.base.api.basedistributor.*;
-import com.yxt.anrui.base.api.basedistributor.app.BaseDistributorsListVo;
-import com.yxt.anrui.base.api.basedistributor.app.BaseDistributorsVo;
-import com.yxt.anrui.base.api.basedistributor.app.BaseInfoVo;
-import com.yxt.anrui.base.api.basedistributor.app.BaseInvoiceInfoVo;
+import com.yxt.anrui.base.api.basedistributor.app.*;
 import com.yxt.anrui.base.api.basemiddleman.BaseMiddleman;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -120,4 +117,6 @@ public interface BaseDistributorMapper extends BaseMapper<BaseDistributor> {
     void updateInvoiceBySid(@Param("invoBankNum") String invoBankNum, @Param("invoBank") String invoBank, @Param("invoPhone") String invoPhone, @Param("sid") String sid);
 
     List<BaseDistributorListVo> selectDisList(String orgSid);
+
+    List<BaseDistributorsListVo> getDistributors(BaseDistributorsListQuery pagerQuery, @Param(Constants.WRAPPER) QueryWrapper<BaseMiddleman> qw);
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorMapper.xml

@@ -194,4 +194,9 @@
         where length(pDistributorSid) > 0
           and useOrg = #{orgSid}
     </select>
+    <select id="getDistributors"
+            resultType="com.yxt.anrui.base.api.basedistributor.app.BaseDistributorsListVo">
+        select sid, disName orgName, pDistributorName, registNum, contract, mobile
+        from base_distributor ${ew.customSqlSegment}
+    </select>
 </mapper>

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorRest.java

@@ -181,6 +181,13 @@ public class BaseDistributorRest implements BaseDistributorFeign {
         return rb.success().setData(list);
     }
 
+    @Override
+    public ResultBean<List<BaseDistributorsListVo>> getDistributors(BaseDistributorsListQuery pagerQuery) {
+        ResultBean rb = ResultBean.fireFail();
+        List<BaseDistributorsListVo> list = baseDistributorService.getDistributors(pagerQuery);
+        return rb.success().setData(list);
+    }
+
     @Override
     public ResultBean<PagerVo<BaseDistributorsListVo>> getDistributorList(PagerQuery<BaseDistributorsListQuery> pagerQuery) {
         ResultBean<PagerVo<BaseDistributorsListVo>> rb = ResultBean.fireFail();

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorService.java

@@ -530,6 +530,26 @@ public class BaseDistributorService extends MybatisBaseService<BaseDistributorMa
         return p;
     }
 
+
+    public List<BaseDistributorsListVo> getDistributors(BaseDistributorsListQuery pagerQuery) {
+        QueryWrapper<BaseMiddleman> qw = new QueryWrapper<>();
+        if (pagerQuery != null) {
+            if (StringUtils.isNotBlank(pagerQuery.getOrgName())) {
+                qw.like("disName", pagerQuery.getOrgName());
+            }
+            if (StringUtils.isNotBlank(pagerQuery.getOrgPath())) {
+                qw.eq("useOrg", pagerQuery.getOrgPath());
+            } else {
+                if (StringUtils.isNotBlank(pagerQuery.getUserSid())) {
+                    ResultBean<String> resultBean = sysStaffOrgFeign.getPathSidByUserSid(pagerQuery.getUserSid());
+                    qw.eq("useOrg", resultBean.getData());
+                }
+            }
+        }
+        List<BaseDistributorsListVo> list = baseMapper.getDistributors(pagerQuery,qw);
+        return list;
+    }
+
     public PagerVo<BaseDistributorsVo> getDistributorListOne(PagerQuery<BaseDistributorsQuery> pagerQuery) {
         IPage<BaseDistributor> page = PagerUtil.queryToPage(pagerQuery);
         BaseDistributorsQuery params = pagerQuery.getParams();

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerMapper.java

@@ -141,4 +141,6 @@ public interface BaseManufacturerMapper extends BaseMapper<BaseManufacturer> {
 
     @Select("SELECT bm.sid as supplierSid  FROM base_manufacturer bm WHERE bm.useOrg = #{buyerOrgSid} and bm.manufacturerName = #{sellerOrgName} and bm.supplierType = '0005' ")
     String selectByInternalPurchaseSid(@Param("buyerOrgSid") String buyerOrgSid, @Param("sellerOrgName") String sellerOrgName);
+
+    List<Map<String, Object>> selectByZjcAndUseOrgIsNull();
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerMapper.xml

@@ -305,4 +305,13 @@
                      left join base_vehicle_brand bb on bm.carBrand = bb.sid
         where bm.sid = #{modelSid}
     </select>
+
+    <select id="selectByZjcAndUseOrgIsNull" resultType="java.util.Map">
+        SELECT manufacturerName,
+               sid
+        FROM base_manufacturer
+        WHERE supplierType = "0001"
+          AND (useOrg = ""
+                OR useOrg IS NULL)
+    </select>
 </mapper>

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerRest.java

@@ -169,6 +169,12 @@ public class BaseManufacturerRest implements BaseManufacturerFeign {
         return new ResultBean<List<Map<String, Object>>>().success().setData(stringList);
     }
 
+    @Override
+    public ResultBean<List<Map<String, Object>>> selectByZjcAndUseOrgIsNull() {
+        List<Map<String, Object>> stringList = baseManufacturerService.selectByZjcAndUseOrgIsNull();
+        return new ResultBean<List<Map<String, Object>>>().success().setData(stringList);
+    }
+
     @Override
     public ResultBean<PagerVo<BaseManufacturerAppSearchVo>> selectAppListByOrgSid(PagerQuery<BaseManufactureSelectQuery> query) {
         ResultBean<PagerVo<BaseManufacturerAppSearchVo>> rb = ResultBean.fireFail();

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerService.java

@@ -654,4 +654,7 @@ public class BaseManufacturerService extends MybatisBaseService<BaseManufacturer
         String sid = baseMapper.selectByInternalPurchaseSid(buyerOrgSid, sellerOrgName);
         return rb.success().setData(sid);
     }
+    public List<Map<String, Object>> selectByZjcAndUseOrgIsNull() {
+        return baseMapper.selectByZjcAndUseOrgIsNull();
+    }
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java

@@ -31,16 +31,20 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.anrui.base.api.basemanufacturer.BaseManufacturer;
 import com.yxt.anrui.base.api.baseoutsourcingapplication.*;
 import com.yxt.anrui.base.api.baseoutsourcingapplication.flow.GetNodeVo;
 import com.yxt.anrui.base.api.baseoutsourcingapplicationvehicle.BaseOutsourcingApplicationVehicle;
 import com.yxt.anrui.base.api.baseoutsourcingapplicationvehicle.BaseOutsourcingApplicationVehicleDto;
 import com.yxt.anrui.base.api.baseoutsourcingapplicationvehicle.BaseOutsourcingApplicationVehicleVo;
+import com.yxt.anrui.base.api.basevehicle.BaseVehicle;
 import com.yxt.anrui.base.api.commonappendix.CommonAppendix;
 import com.yxt.anrui.base.api.commonappendix.CommonAppendixVo;
 import com.yxt.anrui.base.api.commonappendix.CommonAttachTypeEnum;
 import com.yxt.anrui.base.api.flow.FlowTaskVo;
+import com.yxt.anrui.base.biz.basemanufacturer.BaseManufacturerService;
 import com.yxt.anrui.base.biz.baseoutsourcingapplicationvehicle.BaseOutsourcingApplicationVehicleService;
+import com.yxt.anrui.base.biz.basevehicle.BaseVehicleService;
 import com.yxt.anrui.base.biz.commonappendix.CommonAppendixService;
 import com.yxt.anrui.base.common.enums.BillTypeEnum;
 import com.yxt.anrui.base.common.enums.ManPurOrderType;
@@ -137,6 +141,8 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService<BaseOu
     private FileUploadComponent fileUploadComponent;
     @Autowired
     private AppSubsetVersionFeign appSubsetVersionFeign;
+    @Autowired
+    private BaseManufacturerService baseManufacturerService;
 
     private QueryWrapper<BaseOutsourcingApplication> createQueryWrapper(BaseOutsourcingApplicationQuery query) {
         // todo: 这里根据具体业务调整查询条件
@@ -688,6 +694,12 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService<BaseOu
         } else if (costTitleKey.equals(ManPurOrderType.CostTitle.DJ_COSTTITLE.getCode())) {
             finPaymentrecordDto.setCost(booad.getDeposit().intValue());
         }
+        //供应商编码
+        String purchasingUnitSid = booad.getPurchasingUnitSid();
+        BaseManufacturer baseManufacturer = baseManufacturerService.fetchBySid(purchasingUnitSid);
+        finPaymentrecordDto.setPayCode(baseManufacturer.getManufacturerCode());
+        //业务sid
+        finPaymentrecordDto.setBusSid(booad.getSid());
         finPaymentrecordFeign.save(finPaymentrecordDto);
     }
 

anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java

@@ -46,6 +46,7 @@ public enum ProcDefEnum {
     ProcDefEnum(String proDefName, String proDefId) {
         this.proDefName = proDefName;
         this.proDefId = proDefId;
+
     }
 
     /**

anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java

@@ -343,6 +343,7 @@ public class FlowableRest implements FlowableFeign {
                         UserQuery userQuery = new UserQuery();
                         userQuery.setRoleSid(roleSid);
                         userQuery.setOrgSidPath(dto.getOrgSidPath());
+                        userQuery.setOrgPath(dto.getOrgPath());
                         List<SysUserVo> sysUserVos = sysUserFeign.getUserByRole(userQuery).getData();
                         sysUserVoLists.addAll(sysUserVos);
                     }

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserFeign.java

@@ -180,6 +180,11 @@ public interface SysUserFeign {
     @GetMapping("/selectUserInfoByUserSid/{userSid}")
     public ResultBean<SysUserInfoVo> selectUserInfoByUserSid(@PathVariable("userSid") String userSid);
 
+    @ApiOperation(value = "根据用户的sid查询用户的组织信息")
+    @ResponseBody
+    @GetMapping("/selectUserInfoByUserSid/{userSid}/{orgSid}")
+    public ResultBean<SysUserInfoVo> selectUserInfoByUserSid(@PathVariable("userSid") String userSid,@PathVariable("orgSid") String orgSid);
+
     @PostMapping("/setIsEnable/{sid}/{isEnable}")
     @ResponseBody
     @ApiOperation(value = "设置是否可用：isEnable：1可用，0不可用")

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserFeignFallback.java

@@ -165,6 +165,11 @@ public class SysUserFeignFallback implements SysUserFeign {
 		return rb.setMsg("接口anrui_portal/sysuser/selectUserInfoByUserSid无法访问");
 	}
 
+	@Override
+	public ResultBean<SysUserInfoVo> selectUserInfoByUserSid(String userSid, String orgSid) {
+		return null;
+	}
+
 	@Override
 	public ResultBean setIsEnable(String sid, String isEnable) {
 		return null;

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserMapper.java

@@ -127,6 +127,7 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
      * @return
      */
     SysUserInfoVo selectUserInfoByUserSid(String userSid);
+    SysUserInfoVo selectUserInfoByUserSidOne(@Param("userSid") String userSid,@Param("orgSid") String orgSid);
 
     /**
      * 根据员工sid更新用户的工号以及手机号

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserMapper.xml

@@ -182,6 +182,17 @@
         ORDER BY sso.id
         LIMIT 1
     </select>
+
+    <select id="selectUserInfoByUserSidOne" resultType="com.yxt.anrui.portal.api.sysuser.SysUserInfoVo">
+        SELECT su.staffSid, si.name staffName, sso.orgSid, sso.orgName, so.orgCode
+        FROM sys_user su
+        LEFT JOIN sys_staffinfo si ON su.staffSid = si.sid
+        LEFT JOIN sys_staff_org sso ON su.staffSid = sso.staffSid
+        LEFT JOIN sys_organization so ON sso.orgSid = so.sid
+        WHERE su.sid = #{userSid} and find_in_set(#{orgSid}, replace(sso.orgSidPath, '/', ','))
+        ORDER BY sso.id
+        LIMIT 1
+    </select>
     <!--根据员工sid更新用户表的工号以及手机号-->
     <update id="updateByStaffSid">
         update sys_user

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserRest.java

@@ -571,6 +571,16 @@ public class SysUserRest implements SysUserFeign {
         return rb.success().setData(sysUserInfoVo);
     }
 
+    @Override
+    public ResultBean<SysUserInfoVo> selectUserInfoByUserSid(String userSid, String orgSid) {
+        ResultBean<SysUserInfoVo> rb = ResultBean.fireFail();
+        SysUserInfoVo sysUserInfoVo = sysUserService.selectUserInfoByUserSid(userSid,orgSid);
+        if (sysUserInfoVo == null) {
+            return rb.setData(new SysUserInfoVo()).setMsg("该用户未设置所属部门");
+        }
+        return rb.success().setData(sysUserInfoVo);
+    }
+
     @Override
     public ResultBean setIsEnable(String sid, String isEnable) {
         SysUser sysUser = sysUserService.fetchBySid(sid);

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserService.java

@@ -887,7 +887,16 @@ public class SysUserService extends MybatisBaseService<SysUserMapper, SysUser> {
      */
     public SysUserInfoVo selectUserInfoByUserSid(String userSid) {
         return baseMapper.selectUserInfoByUserSid(userSid);
+    }
 
+    /**
+     * 根据用户sid获取用户的组织信息
+     *
+     * @param userSid 用户的sid
+     * @return
+     */
+    public SysUserInfoVo selectUserInfoByUserSid(String userSid,String orgSid) {
+        return baseMapper.selectUserInfoByUserSidOne(userSid,orgSid);
     }
 
     /**
@@ -968,10 +977,10 @@ public class SysUserService extends MybatisBaseService<SysUserMapper, SysUser> {
         if (StringUtils.isBlank(query.getRoleSid())) {
             return rb.setMsg("角色sid不能为空");
         }
+        if(StringUtils.isBlank(query.getOrgPath())){
             if (StringUtils.isBlank(query.getOrgSidPath())) {
                 return rb.setMsg("机构全路径不能为空");
             }
-        if(StringUtils.isBlank(query.getOrgPath())){
             //根据角色sid获取角色的层级
             String levelTypeKey = sysRoleService.getLevelType(query.getRoleSid());
             if (StringUtils.isNotBlank(levelTypeKey)) {

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java

@@ -16,6 +16,7 @@ import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModel;
 import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModelFeign;
 import com.yxt.anrui.base.api.busvehicleorder.ActualAndOrgDeptVo;
 import com.yxt.anrui.base.api.busvehicleorder.BusVehicleOrderFeign;
+import com.yxt.anrui.base.api.busvehicleorder.BusVehicleOrderVo;
 import com.yxt.anrui.base.api.commonappendix.CommonAttachTypeEnum;
 import com.yxt.anrui.base.common.enums.ManPurOrderType;
 import com.yxt.anrui.base.common.enums.OperVehicleState;

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleenterlibrary/ScmVehicleEnterlibraryService.java

@@ -405,7 +405,7 @@ public class ScmVehicleEnterlibraryService extends MybatisBaseService<ScmVehicle
                         //根据外采编号查询外采的申请人部门
                         String createBySid = applicationDetailsVo.getCreateBySid();
                         //查询该申请人的部门
-                        ResultBean<SysUserInfoVo> sysUserInfoVoResultBean = sysUserFeign.selectUserInfoByUserSid(createBySid);
+                        ResultBean<SysUserInfoVo> sysUserInfoVoResultBean = sysUserFeign.selectUserInfoByUserSid(createBySid,applicationDetailsVo.getUseOrgSid());
                         if (sysUserInfoVoResultBean.getSuccess()) {
                             SysUserInfoVo sysUserInfoVo = sysUserInfoVoResultBean.getData();
                             if (sysUserInfoVo != null) {

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineService.java

@@ -621,11 +621,13 @@ public class ScmVehicleExamineService extends MybatisBaseService<ScmVehicleExami
                         finPaymentrecordDto.setPayType(1); // 付款类别，1付款/2退款
                         finPaymentrecordDto.setCostTypeKey(ManPurOrderType.ManOrderType.WC_ORDER.getCode()); // 款项类别
                         finPaymentrecordDto.setCostTypeValue(ManPurOrderType.ManOrderType.WC_ORDER.getRemarks());// 款项类别
-                        finPaymentrecordDto.setCostTitleKey("2");// 款项名称
-                        finPaymentrecordDto.setCostTitleValue("订金");//款项名称
+                        finPaymentrecordDto.setCostTitleKey(ManPurOrderType.CostTitle.CK_COSTTITLE.getCode());// 款项名称
+                        finPaymentrecordDto.setCostTitleValue(ManPurOrderType.CostTitle.CK_COSTTITLE.getRemarks());//款项名称
                         finPaymentrecordDto.setReceiveBankAccount(outsourcingApplicationDetailsVo.getBankAccount()); // 收款银行账号
                         finPaymentrecordDto.setReceiveCompany(outsourcingApplicationDetailsVo.getPurchasingUnitName());
-                        finPaymentrecordDto.setCost(Integer.valueOf(outsourcingApplicationDetailsVo.getPurchasePrice()));
+                        Integer price = Integer.valueOf(outsourcingApplicationDetailsVo.getPurchasePrice());
+                        Integer num = outsourcingApplicationDetailsVo.getNum();
+                        finPaymentrecordDto.setCost(price * num - Integer.valueOf(outsourcingApplicationDetailsVo.getDeposit()));
                         finPaymentrecordDto.setBusSid("");
                         finPaymentrecordFeign.save(finPaymentrecordDto);
                     }