Browse Source

Merge remote-tracking branch 'origin/master'

master
God 11 months ago
parent
commit
dc0f3c45a9
  1. 10
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleoutapply/BaseVehicleOutApplyFeign.java
  2. 7
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleoutapply/BaseVehicleOutApplyFeignFallback.java
  3. 10
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyMapper.java
  4. 11
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyMapper.xml
  5. 5
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyRest.java
  6. 11
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyService.java
  7. 62
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleService.java
  8. 37
      yxt-as-ui/src/views/basicinformation/maintenanceitem/maintenanceitemAdd.vue
  9. 4
      yxt-as-ui/src/views/basicinformation/supplier/supplier.vue
  10. 42
      yxt-as-ui/src/views/basicinformation/suppliertype/suppliertype.vue
  11. 6
      yxt-as-ui/src/views/operation/repairbill/repairbillAdd.vue
  12. 6
      yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusreservebill/AsBusreserveBillMapper.xml
  13. 38
      yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusreservebill/AsBusreserveBillService.java
  14. 2
      yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicegroup/AsServiceGroupMapper.xml
  15. 4
      yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicegroup/AsServiceGroupRest.java
  16. 261
      yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicegroup/AsServiceGroupService.java
  17. 4
      yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodssku/BaseGoodsSkuMapper.xml
  18. 6
      yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodssku/BaseGoodsSkuService.java
  19. 3
      yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodssku/GoodsSkuQuery.java

10
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleoutapply/BaseVehicleOutApplyFeign.java

@ -65,14 +65,18 @@ public interface BaseVehicleOutApplyFeign {
@PostMapping("/save")
@ResponseBody
public ResultBean save(@RequestBody BaseVehicleOutApplyDto dto);
@ApiOperation("根据sid删除记录")
@DeleteMapping("/delBySids")
@ResponseBody
public ResultBean delBySids(@RequestBody String[] sids);
@ApiOperation("根据SID获取一条记录")
@GetMapping("/fetchDetailsBySid/{sid}")
@ResponseBody
public ResultBean<BaseVehicleOutApplyDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
}
@ApiOperation("查询根据车架号查询销售订单信息")
@PostMapping("/selectSidByVinNo")
ResultBean<String> selectSidByVinNo(@RequestParam("vinNo") String vinNo);
}

7
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleoutapply/BaseVehicleOutApplyFeignFallback.java

@ -69,4 +69,9 @@ public class BaseVehicleOutApplyFeignFallback implements BaseVehicleOutApplyFeig
ResultBean rb = ResultBean.fireFail();
return rb.setMsg("接口anrui-base/basevehicleoutapply/fetchDetailsBySid无法访问");
}
}
@Override
public ResultBean<String> selectSidByVinNo(String vinNo) {
return null;
}
}

10
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyMapper.java

@ -57,13 +57,15 @@ public interface BaseVehicleOutApplyMapper extends BaseMapper<BaseVehicleOutAppl
//@Update("update base_vehicle_out_apply set name=#{msg} where id=#{id}")
//IPage<BaseVehicleOutApplyVo> voPage(IPage<BaseVehicleOutApply> page, @Param(Constants.WRAPPER) QueryWrapper<BaseVehicleOutApply> qw);
IPage<BaseVehicleOutApplyVoNew> selectPageVo(IPage<BaseVehicleOutApply> page, @Param(Constants.WRAPPER) Wrapper<BaseVehicleOutApply> qw);
List<BaseVehicleOutApplyVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<BaseVehicleOutApply> qw);
@Select("select * from base_vehicle_out_apply")
List<BaseVehicleOutApplyVo> selectListVo();
int selectPageVoCount(@Param(Constants.WRAPPER) QueryWrapper<BaseVehicleOutApply> qw);
}
String selectSidByVinNo(@Param("vinNo") String vinNo);
}

11
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyMapper.xml

@ -77,4 +77,13 @@
${ew.sqlSegment}
</where>
</select>
</mapper>
<select id="selectSidByVinNo" resultType="java.lang.String">
SELECT
s.sid
FROM
base_vehicle_out AS o
LEFT JOIN base_vehicle_out_apply AS a ON o.mainSid = a.sid
LEFT JOIN anrui_buscenter.bus_sales_order as s ON a.contractNo = s.contractNo
WHERE o.isDelete = '0' AND o.vinNo LIKE CONCAT( '%', #{vinNo}, '%' )
</select>
</mapper>

5
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyRest.java

@ -92,4 +92,9 @@ public class BaseVehicleOutApplyRest implements BaseVehicleOutApplyFeign {
BaseVehicleOutApplyDetailsVo vo = baseVehicleOutApplyService.fetchDetailsVoBySid(sid);
return rb.success().setData(vo);
}
@Override
public ResultBean<String> selectSidByVinNo(String vinNo) {
return baseVehicleOutApplyService.selectSidByVinNo(vinNo);
}
}

11
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyService.java

@ -55,6 +55,7 @@ import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutionsFeign;
import com.yxt.anrui.riskcenter.api.loansolutions.app.SolutionsDetailsVo;
import com.yxt.common.core.result.ResultBean;
import org.apache.commons.lang3.StringUtils;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.PagerUtil;
@ -295,4 +296,12 @@ public class BaseVehicleOutApplyService extends MybatisBaseService<BaseVehicleOu
BeanUtil.copyProperties(entity, vo);
return vo;
}
}
public ResultBean<String> selectSidByVinNo(String vinNo) {
ResultBean rb = ResultBean.fireFail();
String sid = "";
String substringVinNo = vinNo.substring(vinNo.length() - 8);
sid = baseMapper.selectSidByVinNo(substringVinNo);
return rb.success().setData(sid);
}
}

62
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleService.java

@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.google.common.util.concurrent.ThreadFactoryBuilder;
import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemDetailsVo;
import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemFeign;
import com.yxt.anrui.base.api.basevehicleoutapply.BaseVehicleOutApplyFeign;
import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder;
import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign;
import com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrower;
@ -122,7 +123,8 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
private LoanFinOtherPolicyService loanFinOtherPolicyService;
@Autowired
private LoanFinPolicyService loanFinPolicyService;
@Autowired
private BaseVehicleOutApplyFeign baseVehicleOutApplyFeign;
/**
* 根据销售订单SID生成还款计划表回显
*
@ -4661,6 +4663,8 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
List<FinUncollectedReceivablesDetailedJR> jrList = new ArrayList<>();//金融应收
List<LoanFundDay> loanFundDays = new ArrayList<>();//资金占用费生成记录
for (HistoryDataImportVo v : list) {
String isOther = "0";//是否有其他融 1是0否
String sameBank = "0";//是否资方一致 1是0否
String customerNo = ""; //客户编码
String customerSid = "";
String customerName = "";
@ -4671,6 +4675,31 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
String orgPath = "";
String borrowerCustomerSid = "";
String borrowerCustomerName = "";
String mPeriod = v.getMainPeriod();
String mDay = v.getMainRepayDate();
String mF = v.getMainFirstRepay();
String mM = v.getMainMidRepay();
String mL = v.getMainLastRepay();
String oF = "";
String oM = "";
String oL = "";
String oPeriod = "";
String oDay = "";
String salesOrderSid = "";
String loanContractSid = "";
String borrowerSid = "";
String[] splitVin = v.getVinNo().split(",");
if (StringUtils.isNotBlank(v.getOtherBankNo())) {
isOther = "1";
if (v.getBankContractNo().equals(v.getOtherBankNo())) {
sameBank = "1";
}
oF = v.getOtherFirstRepay();
oM = v.getOtherMidRepay();
oL = v.getOtherLastRepay();
oPeriod = v.getOtherPeriod();
oDay = v.getOtherRepayDate();
}
SysOrganization orgDept = sysOrganizationFeign.selectByOrgCode(v.getSalesDeptNo()).getData();
if (orgDept != null) {
deptSid = orgDept.getSid();
@ -4683,7 +4712,7 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
useOrgName = orgCompany.getName();
}
String prefix = getPrefix(orgDept, orgCompany, v.getActualName(), v.getActualPhone());
//客户表新增实际购车人
//客户表新增实际购车人
if (StringUtils.isNotBlank(prefix)) {
CrmCustomerTemp customerTemp = crmCustomerTempFeign.fetchEntityByCustomerNo(prefix).getData();
if (null != customerTemp) {
@ -4691,9 +4720,12 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
customerName = customerTemp.getName();
} else {
CrmCustomerTemp crmCustomerTemp = new CrmCustomerTemp();
String phone = v.getActualPhone() + "-D";
String prefixNo = getPrefix(orgDept, orgCompany, v.getActualName(), phone);
customerSid = crmCustomerTemp.getSid();
customerName = v.getActualName();
crmCustomerTemp.setCustomerNo(prefix);
crmCustomerTemp.setCustomerNo(prefixNo);
crmCustomerTemp.setName(v.getActualName());
crmCustomerTemp.setMobile(v.getActualPhone());
crmCustomerTemp.setCustomerType("个人");
crmCustomerTemp.setCustomerTypeKey("1");
@ -4703,7 +4735,29 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
}
}
//客户表新增贷款人
crmCustomerTempFeign.fetchEntityByCustomerNo(v.getBorrowerNo());
CrmCustomerTemp customerTemp = crmCustomerTempFeign.fetchEntityByCustomerNo(v.getBorrowerNo()).getData();
if (null != customerTemp) {
borrowerCustomerSid = customerTemp.getSid();
borrowerCustomerName = customerTemp.getName();
} else {
CrmCustomerTemp crmCustomerTemp = new CrmCustomerTemp();
borrowerCustomerSid = crmCustomerTemp.getSid();
borrowerCustomerName = v.getBorrowerName();
crmCustomerTemp.setCustomerNo(v.getBorrowerNo());
crmCustomerTemp.setName(v.getBorrowerName());
crmCustomerTemp.setCustomerType("个人");
crmCustomerTemp.setCustomerTypeKey("1");
crmCustomerTemp.setCreateOrgSid(useOrgSid);
crmCustomerTemp.setIsEnable(3);
customerTemps.add(crmCustomerTemp);
}
//根据车架号查询销售订单
String orderSid = baseVehicleOutApplyFeign.selectSidByVinNo(splitVin[0]).getData();
if (StringUtils.isNotBlank(orderSid)) {
}
}

37
yxt-as-ui/src/views/basicinformation/maintenanceitem/maintenanceitemAdd.vue

@ -52,36 +52,36 @@
</el-row>
<el-row>
<el-col :span="8">
<div class="span-sty">排序</div>
<el-form-item><el-input class="addinputInfo addinputw" @keyup.native="formobj.sortNo = getNumber(formobj.sortNo, 0)" v-model="formobj.sortNo" clearable placeholder="" /></el-form-item>
<div class="span-sty"><span class="icon">*</span>排序</div>
<el-form-item prop="sortNo"><el-input class="addinputInfo addinputw" @keyup.native="formobj.sortNo = getNumber(formobj.sortNo, 0)" v-model="formobj.sortNo" clearable placeholder="" /></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">工时单价</div>
<el-form-item><el-input class="addinputInfo addinputw" @input="computeXSJ" @keyup.native="formobj.hourPrice = getNumber(formobj.hourPrice, 2)" v-model="formobj.hourPrice" clearable placeholder="" /></el-form-item>
<div class="span-sty"><span class="icon">*</span>工时单价</div>
<el-form-item prop="hourPrice"><el-input class="addinputInfo addinputw" @input="computeXSJ" @keyup.native="formobj.hourPrice = getNumber(formobj.hourPrice, 2)" v-model="formobj.hourPrice" clearable placeholder="" /></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">工时数</div>
<el-form-item><el-input class="addinputInfo addinputw" @input="computeXSJ" @keyup.native="formobj.hours = getNumber(formobj.hours, 2)" v-model="formobj.hours" clearable placeholder="" /></el-form-item>
<div class="span-sty"><span class="icon">*</span>工时数</div>
<el-form-item prop="hours"><el-input class="addinputInfo addinputw" @input="computeXSJ" @keyup.native="formobj.hours = getNumber(formobj.hours, 2)" v-model="formobj.hours" clearable placeholder="" /></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<div class="span-sty">销售价</div>
<el-form-item><el-input class="addinputInfo addinputw" @keyup.native="formobj.price = getNumber(formobj.price, 2)" @input="computeGSS" v-model="formobj.price" clearable placeholder="" /></el-form-item>
<div class="span-sty"><span class="icon">*</span>销售价</div>
<el-form-item prop="price"><el-input class="addinputInfo addinputw" @keyup.native="formobj.price = getNumber(formobj.price, 2)" @input="computeGSS" v-model="formobj.price" clearable placeholder="" /></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">考核工时</div>
<el-form-item><el-input class="addinputInfo addinputw" @keyup.native="formobj.examineHourPrice = getNumber(formobj.examineHourPrice, 2)" v-model="formobj.examineHourPrice" clearable placeholder="" /></el-form-item>
<div class="span-sty"><span class="icon">*</span>考核工时</div>
<el-form-item prop="examineHourPrice"><el-input class="addinputInfo addinputw" @keyup.native="formobj.examineHourPrice = getNumber(formobj.examineHourPrice, 2)" v-model="formobj.examineHourPrice" clearable placeholder="" /></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">成本</div>
<el-form-item><el-input class="addinputInfo addinputw" @keyup.native="formobj.cost = getNumber(formobj.cost, 2)" v-model="formobj.cost" clearable placeholder="" /></el-form-item>
<div class="span-sty"><span class="icon">*</span>成本</div>
<el-form-item prop="cost"><el-input class="addinputInfo addinputw" @keyup.native="formobj.cost = getNumber(formobj.cost, 2)" v-model="formobj.cost" clearable placeholder="" /></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<div class="span-sty">预约项目</div>
<el-form-item>
<div class="span-sty"><span class="icon">*</span>预约项目</div>
<el-form-item prop="isReserve">
<el-radio-group class="addinputInfo" style="font-size: 1px" v-model="formobj.isReserve">
<el-radio label="1"></el-radio>
<el-radio label="0"></el-radio>
@ -147,7 +147,14 @@ export default {
},
rules: {
sitemName: [{ required: true, message: '项目名称不能为空', trigger: 'blur' }],
serviceType: [{ required: true, message: '工种不能为空', trigger: 'change' }]
serviceType: [{ required: true, message: '工种不能为空', trigger: 'change' }],
sortNo: [{ required: true, message: '排序不能为空', trigger: 'blur' }],
hourPrice: [{ required: true, message: '工时单价不能为空', trigger: 'blur' }],
hours: [{ required: true, message: '工时数不能为空', trigger: 'blur' }],
price: [{ required: true, message: '销售价不能为空', trigger: 'blur' }],
examineHourPrice: [{ required: true, message: '考核工时不能为空', trigger: 'blur' }],
cost: [{ required: true, message: '成本不能为空', trigger: 'blur' }],
isReserve: [{ required: true, message: '预约项目不能为空', trigger: 'change' }]
}
}
},

4
yxt-as-ui/src/views/basicinformation/supplier/supplier.vue

@ -46,8 +46,8 @@
<el-button type="primary" size="mini" @click="toInfo(scope.row)">查看</el-button>
</template>
</el-table-column>
<el-table-column prop="supplierName" label="供应商名称" align="center" width="120" />
<el-table-column prop="supplierCode" label="供应商编码" align="center" width="1110" />
<el-table-column prop="supplierName" label="供应商名称" align="center" min-width="200" />
<el-table-column prop="supplierCode" label="供应商编码" align="center" width="110" />
<el-table-column prop="supplierTypeName" label="供应商类型" align="center" width="110" />
<el-table-column prop="address" label="详细地址" align="center" min-width="200" />
<el-table-column prop="contactTelePhone" label="供应商电话" align="center" width="120" />

42
yxt-as-ui/src/views/basicinformation/suppliertype/suppliertype.vue

@ -46,15 +46,15 @@
</div>
</div>
<el-dialog :visible.sync="dialogVisible" width="70%">
<el-form ref="form_obj" :model="formobj" class="formaddcopy02">
<el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
<el-row style="border-top: 1px solid #E0E3EB">
<el-col :span="12">
<div class="span-sty"><span class="icon">*</span>供应商类型</div>
<el-form-item><el-input class="addinputInfo" style="width: 60%" v-model.trim="formobj.supplierTypeName" clearable placeholder="" /></el-form-item>
<el-form-item prop="supplierTypeName"><el-input class="addinputInfo" style="width: 60%" v-model.trim="formobj.supplierTypeName" clearable placeholder="" /></el-form-item>
</el-col>
<el-col :span="12">
<div class="span-sty"><span class="icon">*</span>供应商编码</div>
<el-form-item><el-input class="addinputInfo" style="width: 60%" v-model.trim="formobj.supplierTypeCode" clearable placeholder="" /></el-form-item>
<div class="span-sty"><span class="icon">*</span>供应商类型编码</div>
<el-form-item prop="supplierTypeCode"><el-input class="addinputInfo" style="width: 60%" v-model.trim="formobj.supplierTypeCode" clearable placeholder="" /></el-form-item>
</el-col>
</el-row>
</el-form>
@ -139,6 +139,10 @@ export default {
supplierTypeName: '',
supplierTypeCode: '',
orgPath: ''
},
rules: {
supplierTypeName: [{ required: true, message: '供应商类型不能为空', trigger: 'blur' }],
supplierTypeCode: [{ required: true, message: '供应商类型编码不能为空', trigger: 'blur' }]
}
}
},
@ -233,6 +237,9 @@ export default {
},
toAdd() {
this.dialogVisible = true
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()
})
this.formobj = {
sid: '',
supplierTypeName: '',
@ -254,16 +261,16 @@ export default {
}
},
handleConfirm() {
if (this.formobj.supplierTypeName === '' || this.formobj.supplierTypeCode === '') {
this.$message({ showClose: true, type: 'error', message: '供应商类型或编码不能为空' })
return
}
this.formobj.orgPath = window.sessionStorage.getItem('defaultOrgPath')
req.saveOrUpdate(this.formobj).then((res) => {
if (res.success) {
this.dialogVisible = false
this.$message({ showClose: true, type: 'success', message: '保存成功' })
this.getList()
this.$refs['form_obj'].validate((valid) => {
if (valid) {
this.formobj.orgPath = window.sessionStorage.getItem('defaultOrgPath')
req.saveOrUpdate(this.formobj).then((res) => {
if (res.success) {
this.dialogVisible = false
this.$message({ showClose: true, type: 'success', message: '保存成功' })
this.getList()
}
})
}
})
},
@ -305,9 +312,12 @@ export default {
</script>
<style scoped>
.span-sty {
width: 100px !important;
width: 120px !important;
}
.addinputInfo {
margin-left: 90px !important;
margin-left: 110px !important;
}
/deep/ .el-form-item__error {
margin-left: 110px !important;
}
</style>

6
yxt-as-ui/src/views/operation/repairbill/repairbillAdd.vue

@ -758,17 +758,17 @@ export default {
this.otherSettle_list = res.data
}
})
getServiceType({ orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((resp) => {
getServiceType({ useOrgSid: window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage.getItem('defaultOrgPath').lastIndexOf('/') + 1) }).then((resp) => {
if (resp.success) {
this.serviceType_list = resp.data
}
})
selSubjectInfo({ orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((resp) => {
selSubjectInfo({ useOrgSid: window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage.getItem('defaultOrgPath').lastIndexOf('/') + 1) }).then((resp) => {
if (resp.success) {
this.subject_list = resp.data
}
})
getGroupList({ orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((resp) => {
getGroupList({ useOrgSid: window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage.getItem('defaultOrgPath').lastIndexOf('/') + 1) }).then((resp) => {
if (resp.success) {
this.group_list = resp.data
}

6
yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusreservebill/AsBusreserveBillMapper.xml

@ -4,7 +4,11 @@
<!-- <where> ${ew.sqlSegment} </where>-->
<!-- ${ew.customSqlSegment} -->
<select id="selectPageVo" resultType="com.yxt.anrui.as.api.asbusreservebill.AsBusreserveBillVo">
SELECT * FROM as_busreserve_bill <where> ${ew.sqlSegment} </where>
SELECT a.* FROM as_busreserve_bill as a
left join anrui_portal.sys_organization as s on a.createDeptSid = s.sid
<where>
${ew.sqlSegment}
</where>
</select>
<select id="selectListAllVo" resultType="com.yxt.anrui.as.api.asbusreservebill.AsBusreserveBillVo">

38
yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusreservebill/AsBusreserveBillService.java

@ -131,18 +131,18 @@ public class AsBusreserveBillService extends MybatisBaseService<AsBusreserveBill
String orgLevelKey = defaultIdReltBean.getData();
if ("1".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i1);
qw.like("orgSidPath", orgSidPath);
qw.like("s.orgSidPath", orgSidPath);
} else if ("2".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i2);
qw.like("orgSidPath", orgSidPath);
qw.like("s.orgSidPath", orgSidPath);
} else if ("3".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i3);
qw.like("orgSidPath", orgSidPath);
qw.like("s.orgSidPath", orgSidPath);
} else if ("4".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i4);
qw.like("orgSidPath", orgSidPath);
qw.like("s.orgSidPath", orgSidPath);
} else if ("5".equals(orgLevelKey)) {
qw.eq("createBySid", query.getUserSid());
qw.eq("a.createBySid", query.getUserSid());
} else {
PagerVo<AsBusreserveBillVo> p = new PagerVo<>();
return p;
@ -154,46 +154,46 @@ public class AsBusreserveBillService extends MybatisBaseService<AsBusreserveBill
}
if (StringUtils.isNotBlank(query.getState())) {
qw.eq("state", query.getState());
qw.eq("a.state", query.getState());
}
if (StringUtils.isNotBlank(query.getUseOrgName())) {
qw.like("useOrgName", query.getUseOrgName());
qw.like("a.useOrgName", query.getUseOrgName());
}
if (StringUtils.isNotBlank(query.getWaitorName())) {
qw.like("waitorName", query.getWaitorName());
qw.like("a.waitorName", query.getWaitorName());
}
if (StringUtils.isNotBlank(query.getCreateDept())) {
qw.like("createDept", query.getCreateDept());
qw.like("a.createDept", query.getCreateDept());
}
if (StringUtils.isNotBlank(query.getCreateByName())) {
qw.like("createByName", query.getCreateByName());
qw.like("a.createByName", query.getCreateByName());
}
if (StringUtils.isNotBlank(query.getBillNo())) {
qw.like("billNo", query.getBillNo());
qw.like("a.billNo", query.getBillNo());
}
if (StringUtils.isNotBlank(query.getCustomerName())) {
qw.like("customerName", query.getCustomerName());
qw.like("a.customerName", query.getCustomerName());
}
if (StringUtils.isNotBlank(query.getVehMark())) {
qw.like("vehMark", query.getVehMark());
qw.like("a.vehMark", query.getVehMark());
}
if (StringUtils.isNotBlank(query.getVinNo())) {
qw.like("vinNo", query.getVinNo());
qw.like("a.vinNo", query.getVinNo());
}
if (StringUtils.isNotBlank(query.getMobile())) {
qw.like("mobile", query.getMobile());
qw.like("a.mobile", query.getMobile());
}
String createStartTime = query.getStartCreateDate();
String createEndTime = query.getEndCreateDate();
qw.apply(StringUtils.isNotEmpty(createStartTime), "date_format (createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')").
apply(StringUtils.isNotEmpty(createEndTime), "date_format (createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')"
qw.apply(StringUtils.isNotEmpty(createStartTime), "date_format (a.createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')").
apply(StringUtils.isNotEmpty(createEndTime), "date_format (a.createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')"
);
String startDate = query.getStartDate();
String endDate = query.getEndDate();
qw.apply(StringUtils.isNotEmpty(startDate), "date_format (reserveStart,'%Y-%m-%d') >= date_format('" + startDate + "','%Y-%m-%d')").
apply(StringUtils.isNotEmpty(endDate), "date_format (reserveStart,'%Y-%m-%d') <= date_format('" + endDate + "','%Y-%m-%d')"
qw.apply(StringUtils.isNotEmpty(startDate), "date_format (a.reserveStart,'%Y-%m-%d') >= date_format('" + startDate + "','%Y-%m-%d')").
apply(StringUtils.isNotEmpty(endDate), "date_format (a.reserveStart,'%Y-%m-%d') <= date_format('" + endDate + "','%Y-%m-%d')"
);
IPage<AsBusreserveBill> page = PagerUtil.queryToPage(pq);
IPage<AsBusreserveBillVo> pagging = baseMapper.selectPageVo(page, qw);

2
yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicegroup/AsServiceGroupMapper.xml

@ -13,7 +13,7 @@
select sid as groupSid,
groupName
from as_service_group
where createOrgSid = #{useOrgSid}
where useOrgSid = #{useOrgSid}
and isDelete = '0'
</select>
</mapper>

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

@ -67,9 +67,9 @@ public class AsServiceGroupRest {
@ApiOperation("查询分公司班组信息")
@PostMapping("/getGroupList")
public ResultBean<List<AsServiceGroupListVo>> getGroupList(@RequestParam("orgPath") String orgPath) {
public ResultBean<List<AsServiceGroupListVo>> getGroupList(@RequestParam("useOrgSid") String useOrgSid) {
ResultBean rb = ResultBean.fireFail();
List<AsServiceGroupListVo> list = asServiceGroupService.getGroupList(orgPath);
List<AsServiceGroupListVo> list = asServiceGroupService.getGroupList(useOrgSid);
return rb.success().setData(list);
}

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

@ -65,150 +65,145 @@ import java.util.List;
@Service
public class AsServiceGroupService extends MybatisBaseService<AsServiceGroupMapper, AsServiceGroup> {
@Autowired
private SysStaffOrgFeign sysStaffOrgFeign;
@Autowired
private SysOrganizationFeign sysOrganizationFeign;
@Autowired
private SysUserFeign sysUserFeign;
@Autowired
private SysStaffOrgFeign sysStaffOrgFeign;
@Autowired
private SysOrganizationFeign sysOrganizationFeign;
@Autowired
private SysUserFeign sysUserFeign;
public PagerVo<AsServiceGroupVo> listPageVo(PagerQuery<AsServiceGroupQuery> pq) {
AsServiceGroupQuery query = pq.getParams();
QueryWrapper<AsServiceGroup> qw = new QueryWrapper<>();
//========================================数据授权开始
if (StringUtils.isNotBlank(query.getMenuUrl())) {
PrivilegeQuery privilegeQuery = new PrivilegeQuery();
privilegeQuery.setOrgPath(query.getOrgPath());
privilegeQuery.setMenuUrl(query.getMenuUrl());
privilegeQuery.setUserSid(query.getUserSid());
ResultBean<String> defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery);
if (StringUtils.isNotBlank(defaultIdReltBean.getData())) {
//数据权限ID(1集团、2事业部、3分公司、4部门、5个人)
String orgSidPath = query.getOrgPath();
orgSidPath = orgSidPath + "/";
int i1 = orgSidPath.indexOf("/");
int i2 = orgSidPath.indexOf("/", i1 + 1);
int i3 = orgSidPath.indexOf("/", i2 + 1);
int i4 = orgSidPath.indexOf("/", i3 + 1);
String orgLevelKey = defaultIdReltBean.getData();
if ("1".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i1);
qw.like("s.orgSidPath", orgSidPath);
} else if ("2".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i2);
qw.like("s.orgSidPath", orgSidPath);
} else if ("3".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i3);
qw.like("s.orgSidPath", orgSidPath);
} else if ("4".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i4);
qw.like("s.orgSidPath", orgSidPath);
} else if ("5".equals(orgLevelKey)) {
qw.eq("asg.createBySid", query.getUserSid());
} else {
PagerVo<AsServiceGroupVo> p = new PagerVo<>();
return p;
}
} else {
PagerVo<AsServiceGroupVo> p = new PagerVo<>();
return p;
}
}
if (StringUtils.isNotBlank(query.getGroupName())){
qw.like("asg.groupName",query.getGroupName());
}
qw.orderByAsc("asg.sortNo");
qw.eq("asg.isDelete",0);
IPage<AsServiceGroup> page = PagerUtil.queryToPage(pq);
IPage<AsServiceGroupVo> pagging = baseMapper.selectPageVo(page, qw);
PagerVo<AsServiceGroupVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}
public PagerVo<AsServiceGroupVo> listPageVo(PagerQuery<AsServiceGroupQuery> pq) {
AsServiceGroupQuery query = pq.getParams();
QueryWrapper<AsServiceGroup> qw = new QueryWrapper<>();
//========================================数据授权开始
if (StringUtils.isNotBlank(query.getMenuUrl())) {
PrivilegeQuery privilegeQuery = new PrivilegeQuery();
privilegeQuery.setOrgPath(query.getOrgPath());
privilegeQuery.setMenuUrl(query.getMenuUrl());
privilegeQuery.setUserSid(query.getUserSid());
ResultBean<String> defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery);
if (StringUtils.isNotBlank(defaultIdReltBean.getData())) {
//数据权限ID(1集团、2事业部、3分公司、4部门、5个人)
String orgSidPath = query.getOrgPath();
orgSidPath = orgSidPath + "/";
int i1 = orgSidPath.indexOf("/");
int i2 = orgSidPath.indexOf("/", i1 + 1);
int i3 = orgSidPath.indexOf("/", i2 + 1);
int i4 = orgSidPath.indexOf("/", i3 + 1);
String orgLevelKey = defaultIdReltBean.getData();
if ("1".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i1);
qw.like("s.orgSidPath", orgSidPath);
} else if ("2".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i2);
qw.like("s.orgSidPath", orgSidPath);
} else if ("3".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i3);
qw.like("s.orgSidPath", orgSidPath);
} else if ("4".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i4);
qw.like("s.orgSidPath", orgSidPath);
} else if ("5".equals(orgLevelKey)) {
qw.eq("asg.createBySid", query.getUserSid());
} else {
PagerVo<AsServiceGroupVo> p = new PagerVo<>();
return p;
}
} else {
PagerVo<AsServiceGroupVo> p = new PagerVo<>();
return p;
}
}
if (StringUtils.isNotBlank(query.getGroupName())) {
qw.like("asg.groupName", query.getGroupName());
}
qw.orderByAsc("asg.sortNo");
qw.eq("asg.isDelete", 0);
IPage<AsServiceGroup> page = PagerUtil.queryToPage(pq);
IPage<AsServiceGroupVo> pagging = baseMapper.selectPageVo(page, qw);
PagerVo<AsServiceGroupVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}
public ResultBean saveOrUpdateDto(AsServiceGroupDto dto){
ResultBean rb = ResultBean.fireFail();
public ResultBean saveOrUpdateDto(AsServiceGroupDto dto) {
ResultBean rb = ResultBean.fireFail();
String dtoSid = dto.getSid();
if (StringUtils.isBlank(dtoSid)) {
String deptName = "";
String deptSid = "";
String createOrgSid = "";
String orgPath = dto.getOrgPath();
if (StringUtils.isNotBlank(orgPath)) {
List<String> split = Arrays.asList(orgPath.split("/"));
if (split.size() > 1) {
//获取本级sid获取本级部门信息
SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(split.get(split.size() - 2)).getData();
SysOrganizationVo sysOrganization1 = sysOrganizationFeign.fetchBySid(split.get(split.size() - 1)).getData();
deptName = sysOrganization.getName() + "/" + sysOrganization1.getName();
deptName = sysOrganization1.getName();
deptSid = sysOrganization1.getSid();
} else {
SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(split.get(0)).getData();
deptName = sysOrganization.getName();
deptName = sysOrganization.getName();
deptSid = sysOrganization.getSid();
}
dto.setUseOrgSid(deptSid);
dto.setUseOrgName(deptName);
createOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
//创建组织使用组织
ResultBean<SysOrganizationVo> organizationResultBean = sysOrganizationFeign.fetchBySid(createOrgSid);
if (organizationResultBean.getData() != null) {
dto.setCreateOrgSid(createOrgSid);
dto.setCreateOrgName(organizationResultBean.getData().getName());
}
}
int i = baseMapper.checkByCodeAndUseOrgSid(dto.getGroupName(), dto.getUseOrgSid());
if (i > 0){
return rb.setMsg("编码已存在");
}
this.insertByDto(dto);
return rb.success();
String deptName = "";
String deptSid = "";
String createOrgSid = "";
String orgPath = dto.getOrgPath();
if (StringUtils.isNotBlank(orgPath)) {
List<String> split = Arrays.asList(orgPath.split("/"));
if (split.size() > 1) {
//获取本级sid获取本级部门信息
SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(split.get(split.size() - 2)).getData();
SysOrganizationVo sysOrganization1 = sysOrganizationFeign.fetchBySid(split.get(split.size() - 1)).getData();
deptName = sysOrganization.getName() + "/" + sysOrganization1.getName();
deptName = sysOrganization1.getName();
deptSid = sysOrganization1.getSid();
} else {
SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(split.get(0)).getData();
deptName = sysOrganization.getName();
deptName = sysOrganization.getName();
deptSid = sysOrganization.getSid();
}
dto.setUseOrgSid(deptSid);
dto.setUseOrgName(deptName);
createOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
//创建组织使用组织
ResultBean<SysOrganizationVo> organizationResultBean = sysOrganizationFeign.fetchBySid(createOrgSid);
if (organizationResultBean.getData() != null) {
dto.setCreateOrgSid(createOrgSid);
dto.setCreateOrgName(organizationResultBean.getData().getName());
}
}
int i = baseMapper.checkByCodeAndUseOrgSid(dto.getGroupName(), dto.getUseOrgSid());
if (i > 0) {
return rb.setMsg("编码已存在");
}
this.insertByDto(dto);
return rb.success();
}
int i = baseMapper.checkSidByCodeAndUseOrgSid(dto.getGroupName(), dto.getUseOrgSid(), dtoSid);
if (i > 0) {
return rb.setMsg("编码已存在");
}
int i = baseMapper.checkSidByCodeAndUseOrgSid(dto.getGroupName(), dto.getUseOrgSid(),dtoSid);
if (i > 0){
return rb.setMsg("编码已存在");
}
this.updateByDto(dto);
return rb.success();
}
this.updateByDto(dto);
return rb.success();
}
public void insertByDto(AsServiceGroupDto dto){
AsServiceGroup entity = new AsServiceGroup();
BeanUtil.copyProperties(dto, entity, "id", "sid");
baseMapper.insert(entity);
}
public void insertByDto(AsServiceGroupDto dto) {
AsServiceGroup entity = new AsServiceGroup();
BeanUtil.copyProperties(dto, entity, "id", "sid");
baseMapper.insert(entity);
}
public void updateByDto(AsServiceGroupDto dto){
String dtoSid = dto.getSid();
public void updateByDto(AsServiceGroupDto dto) {
String dtoSid = dto.getSid();
if (StringUtils.isBlank(dtoSid)) {
return;
}
AsServiceGroup entity = fetchBySid(dtoSid);
BeanUtil.copyProperties(dto, entity, "id", "sid");
baseMapper.updateById(entity);
}
AsServiceGroup entity = fetchBySid(dtoSid);
BeanUtil.copyProperties(dto, entity, "id", "sid");
baseMapper.updateById(entity);
}
public AsServiceGroupDetailsVo fetchDetailsVoBySid(String sid){
AsServiceGroup entity = baseMapper.fetchIsDeleteBySid(sid);
AsServiceGroupDetailsVo vo = new AsServiceGroupDetailsVo();
BeanUtil.copyProperties(entity, vo);
return vo;
}
public AsServiceGroupDetailsVo fetchDetailsVoBySid(String sid) {
AsServiceGroup entity = baseMapper.fetchIsDeleteBySid(sid);
AsServiceGroupDetailsVo vo = new AsServiceGroupDetailsVo();
BeanUtil.copyProperties(entity, vo);
return vo;
}
public List<AsServiceGroupListVo> getGroupList(String orgPath) {
ResultBean<String> orgSidByPath = sysStaffOrgFeign.getOrgSidByPath(orgPath);
if (orgSidByPath.getSuccess()) {
String useOrgSid = orgSidByPath.getData();
List<AsServiceGroupListVo> list = baseMapper.getGroupList(useOrgSid);
return list;
}
return new ArrayList<>();
}
public List<AsServiceGroupListVo> getGroupList(String useOrgSid) {
List<AsServiceGroupListVo> list = baseMapper.getGroupList(useOrgSid);
return list;
}
public void delete(String[] sids) {
for (String sid : sids) {
baseMapper.updateIsDeleteBySid(sid);
}
}
public void delete(String[] sids) {
for (String sid : sids) {
baseMapper.updateIsDeleteBySid(sid);
}
}
}

4
yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodssku/BaseGoodsSkuMapper.xml

@ -63,7 +63,7 @@
<select id="getGoodsListPage" resultType="com.yxt.base.biz.base.basegoodssku.GoodsSkuVo">
select sku.sid goodsSkuSid,
spu.sid as goodsSpuSid,
spu.goodsName goodsSpuName,
sku.title goodsSpuName,
sku.goodsSkuCode,
sku.indexes,
spu.goodsUnitName,
@ -74,4 +74,4 @@
${ew.sqlSegment}
</where>
</select>
</mapper>
</mapper>

6
yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodssku/BaseGoodsSkuService.java

@ -222,12 +222,12 @@ public class BaseGoodsSkuService extends MybatisBaseService<BaseGoodsSkuMapper,
GoodsSkuQuery query = pagerQuery.getParams();
QueryWrapper<BaseGoodsSku> qw = new QueryWrapper<>();
if (query != null) {
if (StringUtils.isNotBlank(query.getOrgSid())) {
qw.eq("spu.createOrgSid", query.getOrgSid());
if (StringUtils.isNotBlank(query.getUseOrgSid())) {
qw.eq("spu.useOrgSid", query.getUseOrgSid());
}
//商品名称
if (StringUtils.isNotBlank(query.getGoodsSpuName())) {
qw.like("spu.goodsName", query.getGoodsSpuName());
qw.like("sku.title", query.getGoodsSpuName());
}
//商品编码
if (StringUtils.isNotBlank(query.getGoodsSkuCode())) {

3
yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodssku/GoodsSkuQuery.java

@ -21,5 +21,6 @@ public class GoodsSkuQuery implements Query {
private String goodsSkuCode;
@ApiModelProperty("厂家名称")
private String manufacturerName;
@ApiModelProperty("部门sid")
private String useOrgSid;
}

Loading…
Cancel
Save