问题修改

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/BillApplicationIInfoVoss.java

@@ -98,4 +98,13 @@ public class BillApplicationIInfoVoss {
     private Boolean showValueCustomer;
     @ApiModelProperty("是否为单独新增")
     private Boolean showBtn;
+
+    // 下载地址
+    private String allDownloadUrl;
+    // 显示生成合同 下载合同按钮  全款/非耽误为true
+    private int contractBtns;
+    // 销售订单开票名称
+    private String orderInvoiceSid;
+    // 销售订单开票价格
+    private String orderInvoicePrice;
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java

@@ -507,7 +507,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
                     record.setInvoiceTypeKey(busSalesOrder.getBillingTypeKey());
                     record.setInvoiceType(busSalesOrder.getBillingType());
                     if ("1".equals(loanNoGuaranteeCreditReviewDetailsVo.getType())){
-                        record.setInvoiceName(loanNoGuaranteeCreditReviewDetailsVo.getBorrowerName());
+                        record.setInvoiceName(busSalesOrderBorrowerDetailsVo.getBorrowerName());
                         record.setOpenTickSid(busSalesOrderBorrowerDetailsVo.getCustomSid());
                         record.setInvoiceInfo(crmCustomerTempVo.getIDNumber());
                     }else if ("2".equals(loanNoGuaranteeCreditReviewDetailsVo.getType())){
@@ -5751,7 +5751,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
                     vinListVos1.setInvoiceTypeKey(busSalesOrder.getBillingTypeKey());
                     vinListVos1.setInvoiceType(busSalesOrder.getBillingType());
                     if ("1".equals(loanNoGuaranteeCreditReviewDetailsVo.getType())){
-                        vinListVos1.setInvoiceName(loanNoGuaranteeCreditReviewDetailsVo.getBorrowerName());
+                        vinListVos1.setInvoiceName(busSalesOrderBorrowerDetailsVo.getBorrowerName());
                         vinListVos1.setOpenTickSid(busSalesOrderBorrowerDetailsVo.getCustomSid());
                         vinListVos1.setInvoiceInfo(crmCustomerTempVo.getIDNumber());
                     }else if ("2".equals(loanNoGuaranteeCreditReviewDetailsVo.getType())){
@@ -5782,6 +5782,30 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
         }
         billApplicationIInfoVoss.setVinList(vinListVos);
         billApplicationIInfoVoss.setFinBillTrailers(pcSelBillGcVos);
+        //生成的合同下载地址
+        int contractBtns = 0;
+        //根据合同号查询销售订单数据
+        busSalesOrder = baseMapper.selectByContract(contractId);
+        SolutionsDetailsVo loanSolutions = loanSolutionsFeign.selectDetailss(busSalesOrder.getSid()).getData();
+        BusSalesOrderModel busSalesOrderModel = baseMapper.selectByOrderSid(busSalesOrder.getSid());
+        BusSalesOrderPrice busSalesOrderPrice = baseMapper.selectByPrices(busSalesOrder.getSid());
+        if ("1".equals(busSalesOrder.getPayTypeKey())) {//全款
+            contractBtns = 1;
+        }else{
+            if(StringUtils.isNotBlank(loanSolutions.getTypeKey())){
+                contractBtns = 2;
+            }
+        }
+        billApplicationIInfoVoss.setContractBtns(contractBtns);
+        //销售订单开票sid
+        if(StringUtils.isNotBlank(busSalesOrder.getAffiliatedCompanySid())){
+            billApplicationIInfoVoss.setOrderInvoiceSid(busSalesOrder.getAffiliatedCompanySid());
+        }
+        if(busSalesOrderPrice != null){
+            if(busSalesOrderPrice.getSingleFinalPrice() != null){
+                billApplicationIInfoVoss.setOrderInvoicePrice(busSalesOrderPrice.getSingleFinalPrice().toString());
+            }
+        }
         return rb.success().setData(billApplicationIInfoVoss);
     }
 

yxt-as/src/main/java/com/yxt/anrui/as/api/asservicegroup/AsServiceGroupDto.java

@@ -51,6 +51,8 @@ public class AsServiceGroupDto implements Dto {
 
     private String sid; // sid
 
+    @ApiModelProperty("创建人sid")
+    private String createBySid;
     @ApiModelProperty("班组名称")
     private String groupName;
     @ApiModelProperty("排序")

yxt-as/src/main/java/com/yxt/anrui/as/api/asservicegroup/AsServiceGroupQuery.java

@@ -49,13 +49,8 @@ import lombok.Data;
 @ApiModel(value = "班组 查询条件", description = "班组 查询条件")
 public class AsServiceGroupQuery implements Query {
 
+    @ApiModelProperty("组织全路径")
+    private String orgPath;
     @ApiModelProperty("班组名称")
     private String groupName;
-    @ApiModelProperty("排序")
-    private Integer sortNo;
-    @ApiModelProperty("使用组织sid")
-    private String useOrgSid;
-    @ApiModelProperty("创建组织sid")
-    private String createOrgSid;
-
 }

yxt-as/src/main/java/com/yxt/anrui/as/api/asservicegroup/AsServiceGroupVo.java

@@ -55,4 +55,6 @@ public class AsServiceGroupVo implements Vo {
     private String groupName;
     @ApiModelProperty("排序")
     private Integer sortNo;
+    @ApiModelProperty("门店")
+    private String createOrgName;
 }

yxt-as/src/main/java/com/yxt/anrui/as/api/asservicesubject/AsServiceSubjectDto.java

@@ -51,6 +51,8 @@ public class AsServiceSubjectDto implements Dto {
 
     private String sid; // sid
 
+    @ApiModelProperty("创建人sid")
+    private String createBySid;
     @ApiModelProperty("科目名称")
     private String subjectName;
     @ApiModelProperty("科目编码")

yxt-as/src/main/java/com/yxt/anrui/as/api/asservicesubject/AsServiceSubjectQuery.java

@@ -49,17 +49,8 @@ import lombok.Data;
 @ApiModel(value = "科目 查询条件", description = "科目 查询条件")
 public class AsServiceSubjectQuery implements Query {
 
+    @ApiModelProperty("组织全路径")
+    private String orgPath;
     @ApiModelProperty("科目名称")
     private String subjectName;
-    @ApiModelProperty("科目编码")
-    private String subjectCode;
-    @ApiModelProperty("科目类型")
-    private String subjectType;
-    @ApiModelProperty("排序")
-    private Integer sortNo;
-    @ApiModelProperty("使用组织sid")
-    private String useOrgSid;
-    @ApiModelProperty("创建组织sid")
-    private String createOrgSid;
-
 }

yxt-as/src/main/java/com/yxt/anrui/as/api/asservicesubject/AsServiceSubjectVo.java

@@ -59,4 +59,6 @@ public class AsServiceSubjectVo implements Vo {
     private String subjectType;
     @ApiModelProperty("排序")
     private Integer sortNo;
+    @ApiModelProperty("门店")
+    private String createOrgName;
 }

yxt-as/src/main/java/com/yxt/anrui/as/api/asservicetype/AsServiceTypeDto.java

@@ -53,6 +53,8 @@ public class AsServiceTypeDto implements Dto {
 
     private String sid; // sid
 
+    @ApiModelProperty("创建人sid")
+    private String createBySid;
     @ApiModelProperty("服务类别名称")
     private String serviceTypeName;
     @ApiModelProperty("服务类别编码")

yxt-as/src/main/java/com/yxt/anrui/as/api/asservicetype/AsServiceTypeQuery.java

@@ -51,8 +51,8 @@ import java.math.BigDecimal;
 @ApiModel(value = "服务类别-工种 查询条件", description = "服务类别-工种 查询条件")
 public class AsServiceTypeQuery implements Query {
 
-    @ApiModelProperty("门店")
+    @ApiModelProperty("组织全路径")
-    private String store;
+    private String orgPath;
     @ApiModelProperty("服务类别名称")
     private String serviceTypeName;
 }

yxt-as/src/main/java/com/yxt/anrui/as/api/asservicetype/AsServiceTypeVo.java

@@ -62,5 +62,5 @@ public class AsServiceTypeVo implements Vo {
     @ApiModelProperty("提成金额")
     private BigDecimal percentageAmount;
     @ApiModelProperty("门店")
-    private String store;
+    private String createOrgName;
 }

yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicegroup/AsServiceGroupRest.java

@@ -76,7 +76,7 @@ public class AsServiceGroupRest{
 	}
 
 	@ApiOperation("根据sid批量删除")
-    @PostMapping("/delBySids")
+    @DeleteMapping("/delBySids")
     public ResultBean delBySids(@RequestBody String[] sids){
 		ResultBean rb = ResultBean.fireFail();
 		asServiceGroupService.delBySids(sids);

yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicegroup/AsServiceGroupService.java

@@ -28,6 +28,9 @@ package com.yxt.anrui.as.biz.asservicegroup;
 import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.anrui.as.feign.portal.sysorganization.SysOrganizationFeign;
+import com.yxt.anrui.as.feign.portal.sysorganization.SysOrganizationVo;
+import com.yxt.anrui.as.feign.portal.sysstafforg.SysStaffOrgFeign;
 import org.apache.commons.lang3.StringUtils;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;
@@ -39,6 +42,7 @@ import com.yxt.anrui.as.api.asservicegroup.AsServiceGroupVo;
 import com.yxt.anrui.as.api.asservicegroup.AsServiceGroupDetailsVo;
 import com.yxt.anrui.as.api.asservicegroup.AsServiceGroupDto;
 
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 /**
@@ -56,16 +60,20 @@ import org.springframework.stereotype.Service;
  */
 @Service
 public class AsServiceGroupService extends MybatisBaseService<AsServiceGroupMapper, AsServiceGroup> {
-	private QueryWrapper<AsServiceGroup> createQueryWrapper(AsServiceGroupQuery query) {
+
-		// todo: 这里根据具体业务调整查询条件
+	@Autowired
-		// 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
+	private SysStaffOrgFeign sysStaffOrgFeign;
-		QueryWrapper<AsServiceGroup> qw = new QueryWrapper<>();
+	@Autowired
-		return qw;
+	private SysOrganizationFeign sysOrganizationFeign;
-	}
 	
 	public PagerVo<AsServiceGroupVo> listPageVo(PagerQuery<AsServiceGroupQuery> pq) {
 		AsServiceGroupQuery query = pq.getParams();
-		QueryWrapper<AsServiceGroup> qw = createQueryWrapper(query);
+		QueryWrapper<AsServiceGroup> qw = new QueryWrapper<>();
+		if (StringUtils.isNotBlank(query.getGroupName())){
+			qw.like("groupName",query.getGroupName());
+		}
+		String createOrgSid = sysStaffOrgFeign.getOrgSidByPath(query.getOrgPath()).getData();
+		qw.eq("createOrgSid",createOrgSid);
 		IPage<AsServiceGroup> page = PagerUtil.queryToPage(pq);
 		IPage<AsServiceGroupVo> pagging = baseMapper.selectPageVo(page, qw);
 		PagerVo<AsServiceGroupVo> p = PagerUtil.pageToVo(pagging, null);
@@ -75,6 +83,11 @@ public class AsServiceGroupService extends MybatisBaseService<AsServiceGroupMapp
 	public void saveOrUpdateDto(AsServiceGroupDto dto){
         String dtoSid = dto.getSid();
         if (StringUtils.isBlank(dtoSid)) {
+			String orgPath = dto.getOrgPath();
+			String createOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
+			SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(createOrgSid).getData();
+			dto.setCreateOrgSid(createOrgSid);
+			dto.setCreateOrgName(sysOrganizationVo.getName());
             this.insertByDto(dto);
             return; 
         } 

yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicesubject/AsServiceSubjectService.java

@@ -28,6 +28,9 @@ package com.yxt.anrui.as.biz.asservicesubject;
 import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.anrui.as.feign.portal.sysorganization.SysOrganizationFeign;
+import com.yxt.anrui.as.feign.portal.sysorganization.SysOrganizationVo;
+import com.yxt.anrui.as.feign.portal.sysstafforg.SysStaffOrgFeign;
 import org.apache.commons.lang3.StringUtils;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;
@@ -39,6 +42,7 @@ import com.yxt.anrui.as.api.asservicesubject.AsServiceSubjectVo;
 import com.yxt.anrui.as.api.asservicesubject.AsServiceSubjectDetailsVo;
 import com.yxt.anrui.as.api.asservicesubject.AsServiceSubjectDto;
 
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 /**
@@ -56,16 +60,20 @@ import org.springframework.stereotype.Service;
  */
 @Service
 public class AsServiceSubjectService extends MybatisBaseService<AsServiceSubjectMapper, AsServiceSubject> {
-	private QueryWrapper<AsServiceSubject> createQueryWrapper(AsServiceSubjectQuery query) {
+
-		// todo: 这里根据具体业务调整查询条件
+	@Autowired
-		// 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
+	private SysStaffOrgFeign sysStaffOrgFeign;
-		QueryWrapper<AsServiceSubject> qw = new QueryWrapper<>();
+	@Autowired
-		return qw;
+	private SysOrganizationFeign sysOrganizationFeign;
-	}
 	
 	public PagerVo<AsServiceSubjectVo> listPageVo(PagerQuery<AsServiceSubjectQuery> pq) {
 		AsServiceSubjectQuery query = pq.getParams();
-		QueryWrapper<AsServiceSubject> qw = createQueryWrapper(query);
+		QueryWrapper<AsServiceSubject> qw = new QueryWrapper<>();
+		if (StringUtils.isNotBlank(query.getSubjectName())){
+			qw.like("subjectName",query.getSubjectName());
+		}
+		String createOrgSid = sysStaffOrgFeign.getOrgSidByPath(query.getOrgPath()).getData();
+		qw.eq("createOrgSid",createOrgSid);
 		IPage<AsServiceSubject> page = PagerUtil.queryToPage(pq);
 		IPage<AsServiceSubjectVo> pagging = baseMapper.selectPageVo(page, qw);
 		PagerVo<AsServiceSubjectVo> p = PagerUtil.pageToVo(pagging, null);
@@ -75,6 +83,11 @@ public class AsServiceSubjectService extends MybatisBaseService<AsServiceSubject
 	public void saveOrUpdateDto(AsServiceSubjectDto dto){
         String dtoSid = dto.getSid();
         if (StringUtils.isBlank(dtoSid)) {
+			String orgPath = dto.getOrgPath();
+			String createOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
+			SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(createOrgSid).getData();
+			dto.setCreateOrgSid(createOrgSid);
+			dto.setCreateOrgName(sysOrganizationVo.getName());
             this.insertByDto(dto);
             return; 
         } 

yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicetype/AsServiceTypeService.java

@@ -72,6 +72,8 @@ public class AsServiceTypeService extends MybatisBaseService<AsServiceTypeMapper
 		if (StringUtils.isNotBlank(query.getServiceTypeName())){
 			qw.like("serviceTypeName", query.getServiceTypeName());
 		}
+        String createOrgSid = sysStaffOrgFeign.getOrgSidByPath(query.getOrgPath()).getData();
+        qw.eq("createOrgSid",createOrgSid);
         IPage<AsServiceType> page = PagerUtil.queryToPage(pq);
         IPage<AsServiceTypeVo> pagging = baseMapper.selectPageVo(page, qw);
         PagerVo<AsServiceTypeVo> p = PagerUtil.pageToVo(pagging, null);