diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysCustomerQuoteServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysCustomerQuoteServiceImpl.java index c6e662f1..6513b7c3 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysCustomerQuoteServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysCustomerQuoteServiceImpl.java @@ -147,23 +147,7 @@ public class SysCustomerQuoteServiceImpl implements ISysCustomerQuoteService { String loginName = ShiroUtils.getLoginName(); sysCustomerQuote.setUpdateBy(loginName); SysUser user = ShiroUtils.getSysUser(); - sysCustomerQuote.setApplyUser(user.getLoginName()); - sysCustomerQuote.setApplyTime(DateUtils.getNowDate()); // 启动流程 - String applyTitle = user.getUserName()+"发起了修改客户报价信息提交审批-"+DateUtils.dateTimeNow(); - String instanceType = "submit"; - ProcessInstance processInstance = startProcessInstance(applyTitle,instanceType,sysCustomerQuote, user); - String processInstanceId = processInstance.getProcessInstanceId(); - // 提交实例id - sysCustomerQuote.setSubmitInstanceId(processInstanceId); - // 存在提交完就流程结束的情况 - boolean processIsFinish = processService.judgeProcessIsFinish(processInstanceId); - if(processIsFinish){ - // 审核状态-审核通过 - sysCustomerQuote.setAuditStatus("1"); - // 使用状态-是 - sysCustomerQuote.setUseStatus("2"); - } return sysCustomerQuoteMapper.updateSysCustomerQuote(sysCustomerQuote); } diff --git a/ruoyi-admin/src/main/resources/mapper/system/SysCustomerMapper.xml b/ruoyi-admin/src/main/resources/mapper/system/SysCustomerMapper.xml index 2a728ce9..99f87465 100644 --- a/ruoyi-admin/src/main/resources/mapper/system/SysCustomerMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/system/SysCustomerMapper.xml @@ -217,7 +217,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" delivery_customer_fax, business_members, identifying_people, - degin_flag, customer_remarks, instance_id, instance_type, @@ -254,7 +253,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{taxRate}, #{integrityRating}, #{rmbRegisteredCapital}, - #{registeredCapital!=null}, + #{registeredCapital}, #{paymentTerms}, #{customsCode}, #{customerContactId}, @@ -270,6 +269,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{deliveryCustomerPostal}, #{deliveryCustomerFax}, #{businessMembers}, + #{identifyingPeople}}, #{customerRemarks}, #{instanceId}, #{instanceType}, diff --git a/ruoyi-admin/src/main/resources/templates/system/customer/customer.html b/ruoyi-admin/src/main/resources/templates/system/customer/customer.html index e9cd86e8..ddceff26 100644 --- a/ruoyi-admin/src/main/resources/templates/system/customer/customer.html +++ b/ruoyi-admin/src/main/resources/templates/system/customer/customer.html @@ -127,23 +127,6 @@ 添加 - 添加其他联系人明细