diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java index a4a85eb7ae..749d576b18 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java @@ -3881,43 +3881,6 @@ public class FinCollectionConfirmationService extends MybatisBaseService 0) { - //未逾期 - Calendar cal_1 = Calendar.getInstance();// 使用默认时区和语言环境获得一个日历 - cal_1.setTime(planDetails.getDueDate()); - cal_1.add(Calendar.DAY_OF_MONTH, -1); - historyEntity.setPrepareDate(cal_1.getTime()); - } else { - //已逾期 - historyEntity.setPrepareDate(new DateTime()); - } - } catch (ParseException e) { - e.printStackTrace(); - } - historyEntity.setReturnWay("间还"); - historyEntity.setReturnWayKey("02"); - historyEntity.setPaymentState("待转付"); - historyEntity.setPaymentStateKey("001"); - } - loanRepaymentHistoryFeign.saveHistoryByEntity(historyEntity); - } //认资方退还垫款或者结清时资方逾期利息 if (v.getReceivablesName().equals("资方退还垫款") || v.getReceivablesName().equals("贷款保证金扣罚")) { CollectionVoucher.CollectionVoucherDetail d = getReturnBackMoneyVoucher(v, collectionDate); @@ -3937,6 +3900,19 @@ public class FinCollectionConfirmationService extends MybatisBaseService 0) { + //未逾期 + Calendar cal_1 = Calendar.getInstance();// 使用默认时区和语言环境获得一个日历 + cal_1.setTime(planDetails.getDueDate()); + cal_1.add(Calendar.DAY_OF_MONTH, -1); + historyEntity.setPrepareDate(cal_1.getTime()); + } else { + //已逾期 + historyEntity.setPrepareDate(new DateTime()); + } + } catch (ParseException e) { + e.printStackTrace(); + } + historyEntity.setPaymentState("待转付"); + historyEntity.setPaymentStateKey("001"); FinUncollectedReceivablesDetailedJR jr = new FinUncollectedReceivablesDetailedJR(); jr.setCreateBySid(userSid); SysUserVo userVo = sysUserFeign.fetchBySid(userSid).getData(); @@ -3983,8 +3977,47 @@ public class FinCollectionConfirmationService extends MybatisBaseService 0) { + //未逾期 + Calendar cal_1 = Calendar.getInstance();// 使用默认时区和语言环境获得一个日历 + cal_1.setTime(planDetails.getDueDate()); + cal_1.add(Calendar.DAY_OF_MONTH, -1); + historyEntity.setPrepareDate(cal_1.getTime()); + } else { + //已逾期 + historyEntity.setPrepareDate(new DateTime()); + } + } catch (ParseException e) { + e.printStackTrace(); + } + historyEntity.setPaymentState("待转付"); + historyEntity.setPaymentStateKey("001"); + } + } else { + try { + Date collDate = sdf.parse(finalConfirmation.getCollectionDate()); + historyEntity.setActualDate(collDate); + if (planDetails.getDueDate().compareTo(collDate) > 0) { + //未逾期 + Calendar cal_1 = Calendar.getInstance();// 使用默认时区和语言环境获得一个日历 + cal_1.setTime(planDetails.getDueDate()); + cal_1.add(Calendar.DAY_OF_MONTH, -1); + historyEntity.setPrepareDate(cal_1.getTime()); + } else { + //已逾期 + historyEntity.setPrepareDate(new DateTime()); + } + } catch (ParseException e) { + e.printStackTrace(); } + historyEntity.setPaymentState("待转付"); + historyEntity.setPaymentStateKey("001"); } + loanRepaymentHistoryFeign.saveHistoryByEntity(historyEntity); } if (v.getReceivablesName().equals("资方逾期利息")) { if (null != planDetails.getPaymentInterest()) { diff --git a/yxt-as-ui/src/api/client/customermanagement.js b/yxt-as-ui/src/api/client/customermanagement.js index 4f2c65e915..3c1b2e0697 100644 --- a/yxt-as-ui/src/api/client/customermanagement.js +++ b/yxt-as-ui/src/api/client/customermanagement.js @@ -70,7 +70,7 @@ export default { }, deleteBySids: function(data) { return request({ - url: '/yxtcrm/apiadmin/v1/crmcustomer/del/', + url: '/yxtcrm/apiadmin/v1/crmcustomer/delBySids', method: 'DELETE', data: data, headers: { 'Content-Type': 'application/json' } diff --git a/yxt-as-ui/src/api/client/maintenanceEnterprise.js b/yxt-as-ui/src/api/client/maintenanceEnterprise.js index 20e25fd7e2..a60f41d83e 100644 --- a/yxt-as-ui/src/api/client/maintenanceEnterprise.js +++ b/yxt-as-ui/src/api/client/maintenanceEnterprise.js @@ -4,7 +4,7 @@ export default { // 查询分页列表 listPage: function(params) { return request({ - url: '/crm/yxtcrm/v1/maintenanceEnterprise/listPage', + url: '/yxtcrm/v1//maintenanceEnterprise/listPage', method: 'post', data: params, headers: { 'Content-Type': 'application/json' } @@ -13,7 +13,7 @@ export default { // 初始化 init(data) { return request({ - url: '/crm/yxtcrm/v1/maintenanceEnterprise/init', + url: '/yxtcrm/v1//maintenanceEnterprise/init', method: 'get', params: data }) @@ -21,13 +21,13 @@ export default { // 编辑回显 fetchDetailsBySid: function(data) { return request({ - url: '/crm/yxtcrm/v1/maintenanceEnterprise/fetchDetailsBySid/' + data, + url: '/yxtcrm/v1//maintenanceEnterprise/fetchDetailsBySid/' + data, method: 'get' }) }, saveOrUpdate: function(data) { return request({ - url: '/crm/yxtcrm/v1/maintenanceEnterprise/save', + url: '/yxtcrm/v1//maintenanceEnterprise/save', method: 'post', data: data, headers: { 'Content-Type': 'application/json' } @@ -35,7 +35,7 @@ export default { }, deleteBySids: function(data) { return request({ - url: '/crm/yxtcrm/v1/maintenanceEnterprise/delBySids', + url: '/yxtcrm/v1//maintenanceEnterprise/delBySids', method: 'DELETE', data: data, headers: { 'Content-Type': 'application/json' } @@ -44,7 +44,7 @@ export default { // 提交流程 submit: function(params) { return request({ - url: '/crm/yxtcrm/v1/maintenanceEnterprise/submit', + url: '/yxtcrm/v1//maintenanceEnterprise/submit', method: 'post', data: params, headers: { 'Content-Type': 'application/json' } @@ -53,7 +53,7 @@ export default { // 流程审批（同意） complete: function(params) { return request({ - url: '/crm/yxtcrm/v1/maintenanceEnterprise/complete', + url: '/yxtcrm/v1//maintenanceEnterprise/complete', method: 'post', data: params, headers: { 'Content-Type': 'application/json' } @@ -62,7 +62,7 @@ export default { // 流程审批（加签） delegate: function(params) { return request({ - url: '/crm/yxtcrm/v1/maintenanceEnterprise/delegate', + url: '/yxtcrm/v1//maintenanceEnterprise/delegate', method: 'post', data: params, headers: { 'Content-Type': 'application/json' } @@ -71,7 +71,7 @@ export default { // 流程审批（驳回） reject: function(params) { return request({ - url: '/crm/yxtcrm/v1/maintenanceEnterprise/reject', + url: '/yxtcrm/v1//maintenanceEnterprise/reject', method: 'post', data: params, headers: { 'Content-Type': 'application/json' } @@ -80,7 +80,7 @@ export default { // 流程审批（终止） breakProcess: function(params) { return request({ - url: '/crm/yxtcrm/v1/maintenanceEnterprise/breakProcess', + url: '/yxtcrm/v1//maintenanceEnterprise/breakProcess', method: 'post', data: params, headers: { 'Content-Type': 'application/json' } @@ -89,7 +89,7 @@ export default { // 流程审批（撤回） revokeProcess: function(params) { return request({ - url: '/crm/yxtcrm/v1/maintenanceEnterprise/revokeProcess', + url: '/yxtcrm/v1//maintenanceEnterprise/revokeProcess', method: 'post', data: params, headers: { 'Content-Type': 'application/json' } @@ -98,7 +98,7 @@ export default { // 审批流程（同意）获取下一环节 getNextNodesForSubmit: function(data) { return request({ - url: '/crm/yxtcrm/v1/maintenanceEnterprise/getNextNodesForSubmit', + url: '/yxtcrm/v1//maintenanceEnterprise/getNextNodesForSubmit', method: 'get', params: data }) @@ -106,7 +106,7 @@ export default { // 审批流程（驳回）获取上一环节 getPreviousNodesForReject: function(data) { return request({ - url: '/crm/yxtcrm/v1/maintenanceEnterprise/getPreviousNodesForReject', + url: '/yxtcrm/v1//maintenanceEnterprise/getPreviousNodesForReject', method: 'get', params: data }) diff --git a/yxt-as-ui/src/views/client/customermanagement/customermanagement.vue b/yxt-as-ui/src/views/client/customermanagement/customermanagement.vue index 5329a23600..29482c371f 100644 --- a/yxt-as-ui/src/views/client/customermanagement/customermanagement.vue +++ b/yxt-as-ui/src/views/client/customermanagement/customermanagement.vue @@ -217,13 +217,13 @@ export default { btnKey: 'addVehicle', btnLabel: '添加车辆' }, - { - type: 'danger', - size: 'small', - icon: 'del', - btnKey: 'doDel', - btnLabel: '删除' - }, + // { + // type: 'danger', + // size: 'small', + // icon: 'del', + // btnKey: 'doDel', + // btnLabel: '删除' + // }, { type: 'success', size: 'small', diff --git a/yxt-as-ui/src/views/operation/repairbill/repairbillAdd.vue b/yxt-as-ui/src/views/operation/repairbill/repairbillAdd.vue index 4aa578eee1..f1550c1cef 100644 --- a/yxt-as-ui/src/views/operation/repairbill/repairbillAdd.vue +++ b/yxt-as-ui/src/views/operation/repairbill/repairbillAdd.vue @@ -5,7 +5,7 @@
{{ viewTitle }}
保存 - 提交 + 提交 退回 确认材料费 打印结算单 @@ -1066,7 +1066,7 @@ export default { this.formobj.customerVehicleSid = value.customerVehicleSid // 单据类型为欠款月结时，对接人信息需要从欠款月结客户中获取对应的对接人信息 if (this.formobj.billTypeKey === '2') { - req.getListByCustomerSid({ customerSid: this.formobj.customerSid }).then((res) => { + req.getListByCustomerSid({ sid: this.formobj.customerSid }).then((res) => { if (res.success) { this.people_list = res.data } @@ -1079,7 +1079,7 @@ export default { this.formobj.billTypeKey = choose[0].dictKey // 针对预约单转成维修单时，单据类型为欠款月结且客户不为空时，对接人信息需要从欠款月结客户中获取对应的对接人信息 if (this.formobj.billTypeKey === '2' && this.formobj.customerSid !== '') { - req.getListByCustomerSid({ customerSid: this.formobj.customerSid }).then((res) => { + req.getListByCustomerSid({ sid: this.formobj.customerSid }).then((res) => { if (res.success) { this.people_list = res.data } diff --git a/yxt-as-ui/src/views/operation/repairbill/repairbillByBeCompleted.vue b/yxt-as-ui/src/views/operation/repairbill/repairbillByBeCompleted.vue index e376283e11..8c28826eb3 100644 --- a/yxt-as-ui/src/views/operation/repairbill/repairbillByBeCompleted.vue +++ b/yxt-as-ui/src/views/operation/repairbill/repairbillByBeCompleted.vue @@ -132,34 +132,6 @@ - - - - - - - - - - - - - - - - - -
- 确定 - 取消 -
-
@@ -184,22 +156,7 @@ export default { data() { return { btndisabled: false, - dialogVisible: false, - gsfKey: 1, - index: 0, - formobj: { - sid: '', - list: [] - }, - allocationProportion_list: [], btnList: [ - { - type: 'primary', - size: 'small', - icon: '', - btnKey: 'toConfirm', - btnLabel: '确认工时费比例' - }, { type: 'primary', size: 'small', @@ -297,9 +254,6 @@ export default { btnHandle(btnKey) { console.log('XXXXXXXXXXXXXXX ' + btnKey) switch (btnKey) { - case 'toConfirm': - this.toConfirm() - break case 'toEdit': this.toEdit() break @@ -383,32 +337,6 @@ export default { } this.getList() }, - toConfirm() { - // req.detailsByManHourFee(this.sids).then((res) => { - // if (res.success) { - // this.dialogVisible = true - // this.formobj = res.data - // } - // }) - }, - allocationProportionChange(value, row) { - const choose = this.allocationProportion_list.filter((item) => item.dictKey === value) - if (choose !== null && choose.length > 0) { - row.allocationProportion = choose[0].dictValue - row.allotmentAmount = Math.round((parseFloat(row.manHourFee) * parseFloat(row.allocationProportion)) * 100) / 100 - } else { - row.allocationProportion = '' - row.allotmentAmount = '' - } - }, - handleConfirm() { - req.saveByManHourFee(this.formobj).then((res) => { - if (res.success) { - this.dialogVisible = false - this.$message({ showClose: true, type: 'success', message: '保存成功' }) - } - }) - }, toEdit() { if (this.sids.length === 1) { this.viewState = 3 diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/ascustomervehicle/AsCustomerVehicleMapper.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/ascustomervehicle/AsCustomerVehicleMapper.java index 86ab551f57..5cd89e1794 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/ascustomervehicle/AsCustomerVehicleMapper.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/ascustomervehicle/AsCustomerVehicleMapper.java @@ -69,9 +69,13 @@ public interface AsCustomerVehicleMapper extends BaseMapper { List selVehListByCustomerSid(@Param("sid") String sid); - @Update("update as_customer_vehicle set isDelete = '1' where sid =#{sid}") +// @Update("update as_customer_vehicle set isDelete = '1' where sid =#{sid}") + @Delete("delete from as_customer_vehicle where sid = #{sid}") void delBySid(@Param("sid") String sid); + + + IPage customerList(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); List getVehListByCustomerSid(@Param("customerSid") String customerSid); diff --git a/yxt-crm-biz/src/main/java/com/yxt/crm/apiadmin/CrmCustomerRest.java b/yxt-crm-biz/src/main/java/com/yxt/crm/apiadmin/CrmCustomerRest.java index 3d9db106ec..c2d8d4d01a 100644 --- a/yxt-crm-biz/src/main/java/com/yxt/crm/apiadmin/CrmCustomerRest.java +++ b/yxt-crm-biz/src/main/java/com/yxt/crm/apiadmin/CrmCustomerRest.java @@ -31,6 +31,7 @@ import com.yxt.common.core.vo.PagerVo; import com.yxt.crm.biz.crmcustomer.*; import com.yxt.crm.biz.crmcustomerorg.CrmCustomerOrgQuery; import com.yxt.crm.biz.crmcustomerorg.CrmCustomerOrgVo; +import com.yxt.crm.biz.crmmaintenanceenterpriserecord.CrmMaintenanceenterpriseRecordService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.apache.commons.lang3.StringUtils; @@ -60,7 +61,8 @@ public class CrmCustomerRest { @Autowired private CrmCustomerService crmCustomerService; - + @Autowired + private CrmMaintenanceenterpriseRecordService crmMaintenanceenterpriseRecordService; @ApiOperation("根据条件分页查询客户信息的列表") @PostMapping("/customerListPage") @@ -93,9 +95,15 @@ public class CrmCustomerRest { @ApiOperation("根据sid批量删除") - @PostMapping("/delBySids") + @DeleteMapping("/delBySids") public ResultBean delBySids(@RequestBody String[] sids) { ResultBean rb = ResultBean.fireFail(); + for (String sid : sids) { + int count = crmMaintenanceenterpriseRecordService.selCountByCustomerSid(sid); + if (count > 0) { + return rb.setMsg("删除数据中包含欠款客户月结备案数据，删除失败"); + } + } crmCustomerService.delBySids(sids); return rb.success(); } @@ -185,4 +193,20 @@ public class CrmCustomerRest { PagerVo pv = crmCustomerService.asListPage(pq); return rb.success().setData(pv); } + + @ApiOperation("定点企业批量禁用") + @PostMapping("/disableState") + public ResultBean disableState(@RequestBody String[] sid) { + ResultBean rb = ResultBean.fireFail(); + crmCustomerService.disableState(sid); + return rb.success(); + } + + @ApiOperation("定点企业批量启用") + @PostMapping("/enable") + public ResultBean enable(@RequestBody String[] sid) { + ResultBean rb = ResultBean.fireFail(); + crmCustomerService.enable(sid); + return rb.success(); + } } diff --git a/yxt-crm-biz/src/main/java/com/yxt/crm/apiadmin/CrmDockingPeopleRest.java b/yxt-crm-biz/src/main/java/com/yxt/crm/apiadmin/CrmDockingPeopleRest.java index 696cc204b7..59bc1d5160 100644 --- a/yxt-crm-biz/src/main/java/com/yxt/crm/apiadmin/CrmDockingPeopleRest.java +++ b/yxt-crm-biz/src/main/java/com/yxt/crm/apiadmin/CrmDockingPeopleRest.java @@ -95,20 +95,20 @@ public class CrmDockingPeopleRest{ @ApiOperation("对接人批量禁用") @PostMapping("/disableState") - public ResultBean disableState(String[] sid) { + public ResultBean disableState(@RequestBody String[] sid) { return crmDockingPeopleService.disableState(sid); } @ApiOperation("对接人批量启用") @PostMapping("/enable") - public ResultBean enable(String[] sid) { + public ResultBean enable(@RequestBody String[] sid) { return crmDockingPeopleService.enable(sid); } @ApiOperation("根据客户SID获取一条记录") @GetMapping("/getListByCustomerSid") @ResponseBody - public ResultBean> getListByCustomerSid(String customerSid) { + public ResultBean> getListByCustomerSid(@RequestParam("sid") String customerSid) { ResultBean rb = ResultBean.fireFail(); List list = crmDockingPeopleService.getListByCustomerSid(customerSid); return rb.success().setData(list); diff --git a/yxt-crm-biz/src/main/java/com/yxt/crm/biz/crmcustomer/CrmCustomerService.java b/yxt-crm-biz/src/main/java/com/yxt/crm/biz/crmcustomer/CrmCustomerService.java index 60a7b3cf94..afd4a49ff5 100644 --- a/yxt-crm-biz/src/main/java/com/yxt/crm/biz/crmcustomer/CrmCustomerService.java +++ b/yxt-crm-biz/src/main/java/com/yxt/crm/biz/crmcustomer/CrmCustomerService.java @@ -305,7 +305,21 @@ public class CrmCustomerService extends MybatisBaseService asListPage(PagerQuery pq) { AsCustomerListQuery query = pq.getParams(); QueryWrapper qw = new QueryWrapper<>(); @@ -389,7 +403,7 @@ public class CrmCustomerService extends MybatisBaseService map); + + int selCountByCustomerSid(@Param("customerSid") String customerSid); } diff --git a/yxt-crm-biz/src/main/java/com/yxt/crm/biz/crmmaintenanceenterpriserecord/CrmMaintenanceenterpriseRecordMapper.xml b/yxt-crm-biz/src/main/java/com/yxt/crm/biz/crmmaintenanceenterpriserecord/CrmMaintenanceenterpriseRecordMapper.xml index c4d78ec812..39c0799c01 100644 --- a/yxt-crm-biz/src/main/java/com/yxt/crm/biz/crmmaintenanceenterpriserecord/CrmMaintenanceenterpriseRecordMapper.xml +++ b/yxt-crm-biz/src/main/java/com/yxt/crm/biz/crmmaintenanceenterpriserecord/CrmMaintenanceenterpriseRecordMapper.xml @@ -71,8 +71,13 @@ WHERE nodeState != '待提交' and find_in_set(sid, #{list}) + - + UPDATE crm_maintenanceenterprise_record SET nodeState=#{nodeState} , nodeSid=#{taskDefKey} diff --git a/yxt-crm-biz/src/main/java/com/yxt/crm/biz/crmmaintenanceenterpriserecord/CrmMaintenanceenterpriseRecordService.java b/yxt-crm-biz/src/main/java/com/yxt/crm/biz/crmmaintenanceenterpriserecord/CrmMaintenanceenterpriseRecordService.java index 6f1b954dc1..07d9ea82b4 100644 --- a/yxt-crm-biz/src/main/java/com/yxt/crm/biz/crmmaintenanceenterpriserecord/CrmMaintenanceenterpriseRecordService.java +++ b/yxt-crm-biz/src/main/java/com/yxt/crm/biz/crmmaintenanceenterpriserecord/CrmMaintenanceenterpriseRecordService.java @@ -1008,4 +1008,7 @@ public class CrmMaintenanceenterpriseRecordService extends MybatisBaseService