上传新jar

src/main/java/com/jkcredit/invoice/model/entity/waybill/NoCarCompanyManger.java

@@ -75,10 +75,12 @@ public class NoCarCompanyManger extends BaseMode{
 
     /**
      * 状态 todo 这里需要处理清楚逻辑，如果没有上传过企业开票经办人，是不能进行变更经办人的（证明附件不进行强制教研）
-     * 1-变更经办人成功（已输入验证码确认）（客户端）
-     * 2-待输入验证码（已提交变更企业开票经办人成功）（客户端）
-     * 3-开票经办人上传成功（管理端）
-     * 4-证明附件上传成功（管理端）
+     * 1-变更经办人短信确认成功（已输入验证码确认）（客户端）
+     * 2-变更经办人发送短信（已提交变更企业开票经办人成功）（客户端）
+     * 3-经办人提交成功（管理端）
+     * 4-证明附件提交成功（管理端）
+     * 5-开票经办人短信发送
+     * 6-开票经办人认证成功
      */
     private String status;
 
@@ -92,4 +94,9 @@ public class NoCarCompanyManger extends BaseMode{
      * 证明协议附件
      */
     private String operatorEvidenceBase64Str;
+
+    /**
+     * 开票短信最后确认时间
+     */
+    private String lastTime;
 }

src/main/java/com/jkcredit/invoice/service/nocar/impl/NoCarCompanyMangerOperImpl.java

@@ -23,6 +23,7 @@ import com.jkcredit.invoice.model.vo.OperatorSendCodeVo;
 import com.jkcredit.invoice.service.manager.ParamService;
 import com.jkcredit.invoice.service.nocar.NoCarCompanyMangerOper;
 import com.jkcredit.invoice.service.upservice.NoCarInterface;
+import com.jkcredit.invoice.util.DateUtil;
 import com.jkcredit.invoice.util.RespR;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
@@ -110,6 +111,7 @@ public class NoCarCompanyMangerOperImpl extends ServiceImpl<NoCarCompanyMangerMa
 
     @Override
     public RespR operatorEvidence(OperatorEvidenceVo operatorEvidenceVo) {
+        log.info("开始上传证明文件：NoCarCompanyMangerOperImpl.operatorEvidenceAdd{}", operatorEvidenceVo);
         OperatorEvidenceRequest operatorEvidenceRequest = new OperatorEvidenceRequest();
         BeanUtils.copyProperties(operatorEvidenceVo,operatorEvidenceRequest);
         RespR respR = noCarInterface.operatorEvidence(operatorEvidenceRequest);
@@ -121,7 +123,7 @@ public class NoCarCompanyMangerOperImpl extends ServiceImpl<NoCarCompanyMangerMa
             updateWrapper.set("operator_evidence_contract_file_name",operatorEvidenceVo.getContractFileName());
             updateWrapper.set("operator_evidence_base64_str",operatorEvidenceVo.getBase64Str());
             updateWrapper.set("status", CommonConst.FOR);
-            updateWrapper.eq("companyNum",operatorEvidenceVo.getCompanyNum());
+            updateWrapper.eq("company_num",operatorEvidenceVo.getCompanyNum());
             NoCarCompanyManger noCarCompanyManger  = new NoCarCompanyManger();
             noCarCompanyManger.setCompanyNum(operatorEvidenceVo.getCompanyNum());
             noCarCompanyMangerMapper.update(noCarCompanyManger,updateWrapper);
@@ -148,6 +150,10 @@ public class NoCarCompanyMangerOperImpl extends ServiceImpl<NoCarCompanyMangerMa
         if (respR.getCode() == 1) {
             return new RespR(false, respR.getMsg());
         } else {
+            UpdateWrapper<NoCarCompanyManger> updateWrapper = new UpdateWrapper<>();
+            updateWrapper.set("status", CommonConst.FIVE);
+            updateWrapper.eq("company_num",customerRec.getCompanyNum());
+            noCarCompanyMangerMapper.update(noCarCompanyManger,updateWrapper);
             return new RespR("success");
         }
     }
@@ -172,6 +178,11 @@ public class NoCarCompanyMangerOperImpl extends ServiceImpl<NoCarCompanyMangerMa
         if (respR.getCode() == 1) {
             return new RespR(false, respR.getMsg());
         } else {
+            UpdateWrapper<NoCarCompanyManger> updateWrapper = new UpdateWrapper<>();
+            updateWrapper.set("status", CommonConst.SIX);
+            updateWrapper.set("last_time", DateUtil.getCurrentDateStr());
+            updateWrapper.eq("company_num",customerRec.getCompanyNum());
+            noCarCompanyMangerMapper.update(noCarCompanyManger,updateWrapper);
             return new RespR("success");
         }
     }

src/main/resources/mapper/customer/CustomerCompanyManagerMapper.xml

@@ -13,9 +13,10 @@
         <result column="contract_file_name" property="contractFileName" jdbcType="VARCHAR"/>
         <result column="base64_str" property="base64Str" jdbcType="VARCHAR"/>
         <result column="status" property="status" jdbcType="VARCHAR"/>
+        <result column="last_time" property="lastTime" jdbcType="VARCHAR"/>
     </resultMap>
     <sql id="Base_Column_List">
-    company_num,company_name, operator_name,operator_mobile, identification_id, operator_name_temp, operator_mobile_temp, identification_id_temp, contract_file_name, status,operator_evidence_contract_file_name
+    company_num,company_name, operator_name,operator_mobile, identification_id, operator_name_temp, operator_mobile_temp, identification_id_temp, contract_file_name, status,operator_evidence_contract_file_name,last_time
   </sql>