Merge remote-tracking branch 'origin/master'

zjugis-business/src/main/java/com/zjugis/business/bean/request/ProjectRequest.java

@@ -86,4 +86,6 @@ public class ProjectRequest {
     private BigDecimal outputValue;
 
     private BigDecimal estimateAmount;
+
+    private LocalDate clickyssj;
 }

zjugis-business/src/main/java/com/zjugis/business/flow/projectStatus/event/ProjectStatusEvent.java

@@ -23,6 +23,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
 import java.math.BigDecimal;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.*;
 
@@ -115,6 +116,7 @@ public class ProjectStatusEvent extends BaseController {
                     project.setYssj(entity.getAcceptTime());
                     project.setYsdyxx(entity.getAcceptState());
                     project.setXmzt(4);
+                    project.setClickyssj(LocalDate.now());
                 }else if("jx".equals(entity.getType())){
                     project.setXmzt(2);
                 }else if("zz".equals(entity.getType())){

zjugis-business/src/main/java/com/zjugis/business/service/impl/CustomerServiceImpl.java

@@ -120,6 +120,9 @@ public class CustomerServiceImpl implements CustomerService {
                 name=result.getData().getCode();
             }
         }
+        if(customer.getXzqdm()!=null){
+            customer.setXzqdm(name+"-"+area);
+        }
         Integer num =customerMapper.getIndexCode(customer);
         if(num==null){
             num=0;

zjugis-business/src/main/resources/mapper/oracle/CustomerMapper.xml

@@ -31,7 +31,7 @@
             ISVALID = 1 and PID =#{id}
         </where>
     </select>
-    <select id="getIndexCode" resultType="com.zjugis.business.bean.response.CustomerResponse">
+    <select id="getIndexCode" resultType="java.lang.Integer">
         SELECT count(*)
         FROM CUSTOMER c
         <where>
@@ -40,7 +40,8 @@
                 AND c.BELONG_COMPANY_ID = #{params.belongCompanyId}
             </if>
             <if test="params != null and params.xzqdm != null and params.xzqdm != ''">
-                AND c.XZQDM = #{params.xzqdm}
+                <bind name="xzqdm" value="params.xzqdm+'%'"/>
+                AND c.CUSTOMER_NUMBER like #{xzqdm}
             </if>
         </where>
     </select>