修改问题

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractDto.java

@@ -52,7 +52,7 @@ public class CommonContractDto implements Dto {
 	@ApiModelProperty("其他方名称")
     private String partyC;
 
-    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     @ApiModelProperty("签订日期")
     private Date createDate;
     

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractVo.java

@@ -1,16 +1,11 @@
 package com.yxt.anrui.base.api.commoncontract;
 
 
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.yxt.anrui.base.api.commonappendix.CommonAppendixVo;
 import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
 
 /**
@@ -70,4 +65,12 @@ public class CommonContractVo implements Vo {
     private List<String> commonAppendixVos;
     @ApiModelProperty("现场签署文件")
     private List<String> sceneSignUrlList;
+    @ApiModelProperty("订金")
+    private String deposit;
+    @ApiModelProperty("签订日期")
+    private String createDate;
+    @ApiModelProperty("签订地点")
+    private String address;
+    @ApiModelProperty("备注")
+    private String remarks;
 }

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

@@ -120,6 +120,10 @@ public interface BaseDistributorMapper extends BaseMapper<BaseDistributor> {
 
     List<BaseDistributorsListVo> getDistributors(BaseDistributorsListQuery pagerQuery, @Param(Constants.WRAPPER) QueryWrapper<BaseMiddleman> qw);
 
+    BaseDistributor selectNameByOne(@Param("useOrgSid") String orgPath, @Param("name") String disName);
+
+    BaseDistributor selectOneBy(@Param("useOrgSid") String useOrg, @Param("name") String disName, @Param("sid") String sid);
+
     @Select("select * from base_distributor where disName = #{disName} and createOrg = #{createOrg} and isDelete = 0")
     BaseDistributorsListVo selByNameAndOrgSid(@Param("disName") String disName,@Param("createOrg") String createOrg);
 

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

@@ -197,4 +197,12 @@
         select sid, disName, pDistributorName, registNum, contract, mobile
         from base_distributor ${ew.customSqlSegment}
     </select>
+
+    <select id="selectNameByOne" resultType="com.yxt.anrui.base.api.basedistributor.BaseDistributor">
+        select * from base_distributor where disName = #{name} AND createOrg = #{useOrgSid} and isDelete = 0
+    </select>
+
+    <select id="selectOneBy" resultType="com.yxt.anrui.base.api.basedistributor.BaseDistributor">
+        select * from base_distributor where disName = #{name} AND createOrg = #{useOrgSid} AND sid &lt;&gt; #{sid} and isDelete = 0
+    </select>
 </mapper>

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

@@ -717,6 +717,11 @@ public class BaseDistributorService extends MybatisBaseService<BaseDistributorMa
             } else {
                 orgPath = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
             }
+            //验证该分公司的经销商名称是否重复
+            BaseDistributor baseDistributor1 = baseMapper.selectNameByOne(orgPath,baseDistributor.getDisName());
+            if(baseDistributor1 != null){
+                return rb.setMsg("该分公司下已存在该名称的经销商");
+            }
             //查询机构信息
             ResultBean<SysOrganizationVo> resultBean = sysOrganizationFeign.fetchBySid(orgPath);
             if (resultBean.getSuccess()) {
@@ -735,6 +740,11 @@ public class BaseDistributorService extends MybatisBaseService<BaseDistributorMa
                 return rb.setMsg("该经销商不存在");
             }
             BeanUtil.copyProperties(dto, baseDistributor);
+            //查询
+            BaseDistributor baseDistributor1 = baseMapper.selectOneBy(baseDistributor.getUseOrg(),baseDistributor.getDisName(),sid);
+            if(baseDistributor1 != null){
+                return rb.setMsg("该分公司下已存在该名称的经销商");
+            }
             baseMapper.updateById(baseDistributor);
         }
         return rb.success().setData(sid);

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="com.yxt.anrui.base.biz.commoncontract.CommonContractMapper">
     <insert id="saveList">
         INSERT INTO common_contract(sid, contractNo, contractType, partyA, partyB, partyC, createBySid,
-        createDate, address, deposit, contractAmount, remarks)
+                                    createDate, address, deposit, contractAmount, remarks)
         VALUES
         <foreach collection="list" item="item" index="index" separator=",">
             (UUID(),<!--sid-->
@@ -23,9 +23,28 @@
     <!--    <where> ${ew.sqlSegment} </where>-->
     <!--    ${ew.customSqlSegment} -->
     <select id="selectPageVo" resultType="com.yxt.anrui.base.api.commoncontract.CommonContractVo">
-        SELECT *
+        SELECT sid,
-        FROM common_contract
+               busSid,
-        ${ew.customSqlSegment}
+               contractNo,
+               contractTypeKey,
+               contractType,
+        staffName,
+        partyA,
+        partyB,
+        modelSid,
+        modelName,
+        num,
+        price,
+        oneDeposit,
+        contractAmount,
+        sceneSignUrl,
+        customerSid,
+        deposit,
+               if(length(nodeState) > 0, nodeState, '待提交') as nodeState,
+        DATE_FORMAT(createDate,'%Y-%m-%d') as createDate,
+        address,
+        remarks
+        FROM common_contract ${ew.customSqlSegment}
     </select>
 
     <select id="selectCountByTypeAndOrgAndCreateDate" resultType="int">
@@ -37,19 +56,19 @@
     </select>
     <select id="listExcel" resultType="com.yxt.anrui.base.api.commoncontract.CommonContractExportVo">
         SELECT cc.`contractNo`,
-        cc.`contractType`,
+               cc.`contractType`,
-        cc.`partyA`,
+               cc.`partyA`,
-        cc.`partyB`,
+               cc.`partyB`,
-        cc.`partyC`,
+               cc.`partyC`,
-        suser.`userName` creatName,
+               suser.`userName` creatName,
-        cc.`createDate`,
+               cc.`createDate`,
-        cc.`address`,
+               cc.`address`,
-        cc.`deposit`,
+               cc.`deposit`,
-        cc.`contractAmount`,
+               cc.`contractAmount`,
-        cc.`remarks`
+               cc.`remarks`
         FROM common_contract cc
-        LEFT JOIN anrui_portal.`sys_user` suser
+                 LEFT JOIN anrui_portal.`sys_user` suser
-        ON cc.createBySid = suser.`sid`
+                           ON cc.createBySid = suser.`sid`
         <where>
             ${ew.sqlSegment}
         </where>
@@ -66,27 +85,27 @@
     </select>
 
     <select id="getContractList" resultType="com.yxt.anrui.base.api.commoncontract.AppCommonContractPageVo">
-        SELECT sid AS contractSid,
+        SELECT sid                                         AS contractSid,
-        contractNo AS contractId,
+               contractNo                                  AS contractId,
-        contractType,
+               contractType,
-        partyB,
+               partyB,
-        modelName as model,
+               modelName                                   as model,
-        staffName as handler,
+               staffName                                   as handler,
-        contractAmount AS contractPrice,
+               contractAmount                              AS contractPrice,
-        if(length(nodeState) > 0, nodeState, '待提交') as nodeState,
+               if(length(nodeState) > 0, nodeState, '待提交') as nodeState,
-        if(length(nodeState) > 0, false, true) as isShowUpdate,
+               if(length(nodeState) > 0, false, true)      as isShowUpdate,
-        commonContractUrl,
+               commonContractUrl,
-        num
+               num
         FROM common_contract
         <where>
             ${ew.sqlSegment}
             <if test="names != null and names != ''">
                 and concat(IFNULL(contractNo
-                , '')
+                  , '')
-                , ifnull(partyB
+                  , ifnull(partyB
-                , '')) LIKE concat('%'
+                  , '')) LIKE concat('%'
-                , #{names}
+                  , #{names}
-                , '%')
+                  , '%')
             </if>
             order by id desc
         </where>
@@ -135,7 +154,7 @@
     <update id="updateFlowFiled">
         UPDATE common_contract
         SET nodeState=#{nodeState}
-        , nodeId=#{taskDefKey}
+          , nodeId=#{taskDefKey}
         <if test="procDefId != null and procDefId != ''">
             , procDefId=#{procDefId}
         </if>
@@ -161,17 +180,15 @@
     </select>
 
     <select id="getAppContractList" resultType="com.yxt.anrui.base.api.commoncontract.AppCommonContractListVo">
-        SELECT
+        SELECT contractNo AS contractId,
-        contractNo AS contractId,
+               sid        AS contractSid,
-        sid AS contractSid,
+               partyB     AS customer,
-        partyB AS customer,
+               modelName  AS model,
-        modelName AS model,
+               modelSid,
-        modelSid,
+               configSid,
-        configSid,
+               num        AS carNum,
-        num AS carNum,
+               price
-        price
+        FROM common_contract
-        FROM
-        common_contract
         <where>
             ${ew.sqlSegment}
         </where>

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java

@@ -45,7 +45,6 @@ import com.yxt.anrui.flowable.api.flowtask.FlowTaskFeign;
 import com.yxt.anrui.flowable.api.flowtask.FlowTaskVo;
 import com.yxt.anrui.flowable.api.flowtask.LatestTaskVo;
 import com.yxt.anrui.flowable.api.sysformlink.SysFormLinkFeign;
-import com.yxt.anrui.flowable.api.sysformlink.SysFormStateVo;
 import com.yxt.anrui.flowable.api.utils.ProcDefEnum;
 import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables;
 import com.yxt.anrui.portal.api.dictcommon.DictCommonFeign;
@@ -208,12 +207,6 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
         QueryWrapper<CommonContract> qw = createQueryWrapper(query);
         IPage<CommonContract> page = PagerUtil.queryToPage(pq);
         IPage<CommonContractVo> pagging = baseMapper.selectPageVo(page, qw);
-        for (CommonContractVo vo : pagging.getRecords()) {
-            ResultBean<SysFormStateVo> resultBean = sysFormLinkFeign.selectStateByBusinessSid(vo.getSid());
-            if (resultBean.getSuccess()) {
-                vo.setNodeState(resultBean.getData().getNodeState());
-            }
-        }
         PagerVo<CommonContractVo> p = PagerUtil.pageToVo(pagging, null);
         return p;
     }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppBusSalesOrderVo.java

@@ -148,4 +148,7 @@ public class AppBusSalesOrderVo implements Vo {
 
     @ApiModelProperty("是否显示终止订单按钮")
     private boolean showStopBtn;
+
+    @ApiModelProperty(value = "合同编号")
+    private String contractId;
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml

@@ -58,9 +58,8 @@
                bo.nodeState is null                   as showUpdateBtn,
                bo.nodeState is null                   as showDeleteBtn,
                0                                      as showFinancialBtn,
-               bo.type
+               bo.type,
-
+                contractNo as contractId
-
         FROM bus_sales_order bo
                  left join bus_sales_order_price bp on bp.salesOrderSid = bo.sid
                  left join bus_sales_order_deposit bd on bd.salesOrderSid = bo.sid

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java

@@ -1458,6 +1458,10 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         IPage<BusSalesOrder> page = PagerUtil.queryToPage(pq);
         IPage<AppBusSalesOrderVo> pagging = baseMapper.getSaleOrders(page, qw, pq.getParams().getName());
         for (AppBusSalesOrderVo record : pagging.getRecords()) {
+            ResultBean<CommonContractVo> commonContractVoResultBean = commonContractFeign.getContractBySalesOrderSid(record.getSaleOrderSid());
+            if(commonContractVoResultBean.getData() != null){
+                record.setContractId(commonContractVoResultBean.getData().getContractNo());
+            }
             record.setShowStopBtn(false);
             if (StringUtils.isNotBlank(record.getCustomerImage())) {
                 record.setCustomerImage(fileUploadComponent.getUrlPrefix() + record.getCustomerImage());
@@ -2720,6 +2724,10 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         }
         AppOrderDetailsVo vo = new AppOrderDetailsVo();
         vo = baseMapper.getSaleOrderDetails(sid);
+        ResultBean<CommonContractVo> commonContractVoResultBean = commonContractFeign.getContractBySalesOrderSid(sid);
+        if(commonContractVoResultBean.getData() != null){
+            vo.setContractId(commonContractVoResultBean.getData().getContractNo());
+        }
         vo.setUserSid(busSalesOrder.getCreateBySid());
         vo.setProcInsId(busSalesOrder.getProcInstId());
         vo.setTaskId(busSalesOrder.getTaskId());

anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempFeign.java

@@ -180,18 +180,4 @@ public interface CrmCustomerTempFeign {
     @ApiOperation("合同审核通过后更新客户档案证件")
     ResultBean saveFileCustomer(@RequestBody CrmCustomerFileDDto dto);
 
-    @ResponseBody
-    @PostMapping("/updateCompany/{sid}/{companyName}")
-    @ApiOperation("测试")
-    ResultBean updateCompany(@PathVariable("sid")String sid,@PathVariable("companyName")String companyName);
-
-    @ResponseBody
-    @PutMapping("/updateEmail/{sid}/{email}")
-    @ApiOperation("测试")
-    ResultBean updateEmail(@PathVariable("sid")String sid,@PathVariable("email")String email);
-
-    @ResponseBody
-    @PutMapping("/updateRemarks")
-    @ApiOperation("测试")
-    ResultBean updateRemarks(@RequestParam("sid")String sid,@RequestParam("remarks")String remarks);
 }

anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempFeignFallback.java

@@ -145,20 +145,5 @@ public class CrmCustomerTempFeignFallback implements CrmCustomerTempFeign {
 		return null;
 	}
 
-	@Override
-	public ResultBean updateCompany(String sid, String companyName) {
-		return null;
-	}
-
-	@Override
-	public ResultBean updateEmail(String sid, String email) {
-		return null;
-	}
-
-	@Override
-	public ResultBean updateRemarks(String sid, String remarks) {
-		return null;
-	}
-
 
 }

anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempMapper.java

@@ -124,12 +124,6 @@ public interface CrmCustomerTempMapper extends BaseMapper<CrmCustomerTemp> {
 
     CrmCustomerTempVo selectNo1(@Param("customerNo") String customerNo, @Param("sid") String sid);
 
-    int updateCompany(@Param("sid") String sid, @Param("companyName") String companyName);
-
-    int updateEmail(@Param("sid") String sid, @Param("email") String email);
-
-    int updateRemarks(@Param("sid") String sid, @Param("remarks") String remarks);
-
     /**
      * 根据客户编码查询客户信息
      * @param customerNo 客户编码

anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempMapper.xml

@@ -220,18 +220,6 @@
           and sid != #{sid}
     </select>
 
-    <update id="updateCompany">
-        update crm_customer_temp set companyName = #{companyName} where sid = #{sid}
-    </update>
-
-    <update id="updateEmail">
-        update crm_customer_temp set e_mail = #{email} where sid = #{sid}
-    </update>
-
-    <update id="updateRemarks">
-        update crm_customer_temp set remarks = #{remarks} where sid = #{sid}
-    </update>
-
     <select id="selectByCustomerNo" resultType="com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTemp">
         select * from crm_customer_temp where customerNo = #{customerNo}
     </select>

anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempRest.java

@@ -294,20 +294,5 @@ public class CrmCustomerTempRest implements CrmCustomerTempFeign {
         return crmCustomerTempService.saveFileCustomer(dto);
     }
 
-    @Override
-    public ResultBean updateCompany(String sid, String companyName) {
-        return crmCustomerTempService.updateCompany(sid,companyName);
-    }
-
-    @Override
-    public ResultBean updateEmail(String sid, String email) {
-        return crmCustomerTempService.updateEmail(sid,email);
-    }
-
-    @Override
-    public ResultBean updateRemarks(String sid, String remarks) {
-        return crmCustomerTempService.updateRemarks(sid,remarks);
-    }
-
 
 }

anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java

@@ -762,9 +762,9 @@ public class CrmCustomerTempService extends MybatisBaseService<CrmCustomerTempMa
         //微信号
         String weixin = dto.getWeixin();
         if ("1".equals(dto.getCustomerType())) {
-            if (!mobile.matches("^((13[0-9])|(14[5,7])|(15[0-3,5-9])|(17[0,3,5-8])|(18[0-9])|166|198|199|(147))\\d{8}$")) {
+           /* if (!mobile.matches("^((13[0-9])|(14[5,7])|(15[0-3,5-9])|(17[0,3,5-8])|(18[0-9])|166|198|199|(147))\\d{8}$")) {
                 return rb.setMsg("手机号格式不正确");
-            }
+            }*/
             if (StringUtils.isNotBlank(dto.getIDNumber())) {
                 if (!weixin.matches("^[1-9]\\d{5}(18|19|([23]\\d))\\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\\d{3}[0-9Xx]$")) {
                     return rb.setMsg("证件号码格式不正确");
@@ -1063,21 +1063,4 @@ public class CrmCustomerTempService extends MybatisBaseService<CrmCustomerTempMa
         return rb.success();
     }
 
-    public ResultBean updateCompany(String sid, String companyName) {
-        ResultBean rb = ResultBean.fireFail();
-        int i = baseMapper.updateCompany(sid,companyName);
-        return rb.success();
-    }
-
-    public ResultBean updateEmail(String sid, String email) {
-        ResultBean rb = ResultBean.fireFail();
-        int i = baseMapper.updateEmail(sid,email);
-        return rb.success();
-    }
-
-    public ResultBean updateRemarks(String sid, String remarks) {
-        ResultBean rb = ResultBean.fireFail();
-        int i = baseMapper.updateRemarks(sid,remarks);
-        return rb.success();
-    }
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/BusOrderSalesVo.java

@@ -108,4 +108,7 @@ public class BusOrderSalesVo implements Vo {
 
     @ApiModelProperty("是否显示终止订单按钮")
     private boolean showStopBtn;
+
+    @ApiModelProperty(value = "合同编号")
+    private String contractId;
 }