fix

zhongzheng-admin-business/src/main/java/com/zhongzheng/controller/company/CompanyController.java

@@ -3,6 +3,7 @@ package com.zhongzheng.controller.company;
 import java.util.List;
 
 import com.zhongzheng.modules.bs.company.vo.CompanyCovenantVo;
+import com.zhongzheng.modules.bs.company.vo.CustomerSingle;
 import lombok.RequiredArgsConstructor;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;

zhongzheng-admin/src/main/java/com/zhongzheng/controller/company/CompanyController.java

@@ -1,9 +1,14 @@
 package com.zhongzheng.controller.company;
+import com.zhongzheng.common.annotation.Log;
 import com.zhongzheng.common.core.controller.BaseController;
+import com.zhongzheng.common.core.domain.AjaxResult;
 import com.zhongzheng.common.core.page.TableDataInfo;
+import com.zhongzheng.common.enums.BusinessType;
+import com.zhongzheng.common.utils.ServletUtils;
 import com.zhongzheng.modules.bs.company.bo.CompanyQueryBo;
 import com.zhongzheng.modules.bs.company.service.ICompanyService;
 import com.zhongzheng.modules.bs.company.vo.CovenantCompanyVo;
+import com.zhongzheng.modules.bs.company.vo.CustomerSingle;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
@@ -34,7 +39,26 @@ public class CompanyController extends BaseController {
     @GetMapping("/getJiaList")
     public TableDataInfo<CovenantCompanyVo> list(CompanyQueryBo bo) {
         startPage();
+        bo.setTenantId(ServletUtils.getRequest().getHeader("TenantId"));
         List<CovenantCompanyVo> list = iCompanyService.getCovenantCompanyList(bo);
         return getDataTable(list);
     }
+    /**
+     * 新增企业
+     */
+    @ApiOperation("同步业务系统企业信息")
+    @Log(title = "企业", businessType = BusinessType.INSERT)
+    @GetMapping("/copyYwCompany")
+    public AjaxResult<Void> addYw() {
+        return toAjax(iCompanyService.getYwCompany() ? 1 : 0);
+    }
+    /**
+     * 新增企业
+     */
+    @ApiOperation("业务系统更新企业信息")
+    @Log(title = "企业", businessType = BusinessType.INSERT)
+    @PostMapping("/updateYwCompany")
+    public AjaxResult<Void> updateYwCompany(@RequestBody CustomerSingle single) {
+        return toAjax(iCompanyService.updateYwCompany(single) ? 1 : 0);
+    }
 }

zhongzheng-admin/src/main/java/com/zhongzheng/controller/covenant/BsCovenantController.java

@@ -242,8 +242,8 @@ public class BsCovenantController extends BaseController {
      */
     @ApiOperation("终止申请")
     @Log(title = "企业协议", businessType = BusinessType.DELETE)
-    @PostMapping("/updateStopStatus")
-    public AjaxResult<Void> updateStopStatus(@RequestParam("covenantId") Long covenantId) {
+    @PostMapping("/updateStopStatus/{covenantId}")
+    public AjaxResult<Void> updateStopStatus(@PathVariable Long covenantId) {
         return toAjax(iBsCovenantService.updateStopStatus(covenantId) ? 1 : 0);
     }
 
@@ -252,8 +252,8 @@ public class BsCovenantController extends BaseController {
      */
     @ApiOperation("取消终止申请")
     @Log(title = "企业协议", businessType = BusinessType.DELETE)
-    @PostMapping("/cancelStopStatus")
-    public AjaxResult<Void> cancelStopStatus(@RequestParam("covenantId") Long covenantId) {
+    @PostMapping("/cancelStopStatus/{covenantId}")
+    public AjaxResult<Void> cancelStopStatus(@PathVariable Long covenantId) {
         return toAjax(iBsCovenantService.cancelStopStatus(covenantId) ? 1 : 0);
     }
 
@@ -294,8 +294,8 @@ public class BsCovenantController extends BaseController {
      */
     @ApiOperation("协议上传确认生效")
     @Log(title = "企业协议", businessType = BusinessType.DELETE)
-    @PostMapping("/confirmAssert")
-    public AjaxResult confirmAssert(@RequestParam("covenantId") Long covenantId) {
+    @PostMapping("/confirmAssert/{covenantId}")
+    public AjaxResult confirmAssert(@PathVariable Long covenantId) {
         return toAjax(iBsCovenantService.confirmAssert(covenantId) ? 1 : 0);
     }
 

zhongzheng-admin/src/main/resources/application-dev.yml

@@ -135,6 +135,7 @@ oldStudySys:
     salePassword: http://gdxypx.xy.com/WitSystem/BussinessApi/GetSaleInfo
     updateInvoicePath: http://gdxypx.xy.com/system/BussinessApi/UpdateInvoiceData
     createExamPath: http://gdxypx.xy.com/system/BussinessApi/CreateSameClass
+    getCustomerList: http://gdxypx.xy.com/WitSystem/BussinessApi/GetCustomerList
 
 officialPush:
     infoPath: closehttps://jypt-dev.gdcic.net/organjxjy/ShangBaoMingdan

zhongzheng-system/src/main/java/com/zhongzheng/modules/bs/company/bo/CompanyAddBo.java

@@ -92,7 +92,10 @@ public class CompanyAddBo {
     /** 营业执照 */
     @ApiModelProperty("营业执照")
     private String businessImg;
-    /** 是否旧系统 */
-    @ApiModelProperty("是否旧系统")
+    /** 信息来源 1 企业智慧系统 2 业务系统 */
+    @ApiModelProperty("信息来源 1 企业智慧系统 2 业务系统")
     private Long formId;
+    /** 业务系统机构id */
+    @ApiModelProperty("业务系统机构id")
+    private Long orgId;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/bs/company/bo/CompanyEditBo.java

@@ -106,7 +106,10 @@ public class CompanyEditBo {
     /** 更新时间 */
     @ApiModelProperty("更新时间")
     private Long updateTime;
-    /** 是否旧系统 */
-    @ApiModelProperty("是否旧系统")
+    /** 信息来源 1 企业智慧系统 2 业务系统 */
+    @ApiModelProperty("信息来源 1 企业智慧系统 2 业务系统")
     private Long formId;
+    /** 业务系统机构id */
+    @ApiModelProperty("业务系统机构id")
+    private Long orgId;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/bs/company/bo/CompanyQueryBo.java

@@ -106,7 +106,10 @@ public class CompanyQueryBo extends BaseEntity {
 	/** 公司以及部门联系人 */
 	@ApiModelProperty("公司id")
 	private Long companyId;
-	/** 是否旧系统 */
-	@ApiModelProperty("是否旧系统")
+	/** 信息来源 1 企业智慧系统 2 业务系统 */
+	@ApiModelProperty("信息来源 1 企业智慧系统 2 业务系统")
 	private Long formId;
+	/** 业务系统机构id */
+	@ApiModelProperty("业务系统机构id")
+	private Long orgId;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/bs/company/domain/Company.java

@@ -81,6 +81,8 @@ private static final long serialVersionUID=1L;
     private Long updateTime;
     @TableField(exist = false)
     private Long tyPeId;
-    /** 是否旧系统 */
+    /** 信息来源 1 企业智慧系统 2 业务系统 */
     private Long formId;
+    /** 业务系统机构id */
+    private Long orgId;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/bs/company/mapper/CompanyMapper.java

@@ -1,6 +1,8 @@
 package com.zhongzheng.modules.bs.company.mapper;
 
 import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
+import com.zhongzheng.modules.bs.company.bo.CompanyAddBo;
+import com.zhongzheng.modules.bs.company.bo.CompanyEditBo;
 import com.zhongzheng.modules.bs.company.domain.Company;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.zhongzheng.modules.bs.company.domain.CompanyDepartment;
@@ -17,4 +19,8 @@ import java.util.List;
 public interface CompanyMapper extends BaseMapper<Company> {
     @InterceptorIgnore(tenantLine = "true")
     List<CompanyVo> selectCompanyList(Company company);
+    @InterceptorIgnore(tenantLine = "true")
+    boolean insertYwCompany(CompanyAddBo company);
+    @InterceptorIgnore(tenantLine = "true")
+    boolean updateYwCompany(CompanyEditBo company);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/bs/company/service/ICompanyService.java

@@ -8,6 +8,7 @@ import com.zhongzheng.modules.bs.company.bo.CompanyAddBo;
 import com.zhongzheng.modules.bs.company.bo.CompanyEditBo;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.zhongzheng.modules.bs.company.vo.CovenantCompanyVo;
+import com.zhongzheng.modules.bs.company.vo.CustomerSingle;
 import com.zhongzheng.modules.bs.covenant.domain.BsCovenantCheck;
 import com.zhongzheng.modules.bs.covenant.vo.BsCovenantVo;
 
@@ -39,6 +40,14 @@ public interface ICompanyService extends IService<Company> {
 	 * 云学堂查询甲方列表
 	 */
 	List<CompanyVo> getJIaCompany(CompanyQueryBo bo);
+	/**
+	 * 同步业务系统企业信息
+	 */
+	boolean getYwCompany();
+	/**
+	 * 更新业务系统企业信息
+	 */
+	boolean updateYwCompany(CustomerSingle single);
 	List<CovenantCompanyVo> getCovenantCompanyList(CompanyQueryBo bo);
 
 	/**

zhongzheng-system/src/main/java/com/zhongzheng/modules/bs/company/service/impl/CompanyServiceImpl.java

@@ -3,21 +3,30 @@ package com.zhongzheng.modules.bs.company.service.impl;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.zhongzheng.common.exception.CustomException;
 import com.zhongzheng.common.utils.DateUtils;
 import com.zhongzheng.common.utils.ServletUtils;
+import com.zhongzheng.common.utils.ToolsUtils;
+import com.zhongzheng.common.utils.http.HttpUtils;
 import com.zhongzheng.modules.bs.company.domain.CompanyCertificate;
 import com.zhongzheng.modules.bs.company.domain.CompanyDepartment;
 import com.zhongzheng.modules.bs.company.service.ICompanyCertificateService;
 import com.zhongzheng.modules.bs.company.service.ICompanyDepartmentService;
 import com.zhongzheng.modules.bs.company.vo.CompanyCovenantVo;
 import com.zhongzheng.modules.bs.company.vo.CovenantCompanyVo;
+import com.zhongzheng.modules.bs.company.vo.CustomerSingle;
 import com.zhongzheng.modules.bs.covenant.domain.BsCovenant;
 import com.zhongzheng.modules.bs.covenant.service.IBsCovenantService;
 import com.zhongzheng.modules.bs.staff.domain.Staff;
 import com.zhongzheng.modules.bs.staff.service.IStaffService;
+import com.zhongzheng.modules.system.domain.SysOldOrg;
+import com.zhongzheng.modules.system.service.ISysOldOrgService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -30,11 +39,10 @@ import com.zhongzheng.modules.bs.company.domain.Company;
 import com.zhongzheng.modules.bs.company.mapper.CompanyMapper;
 import com.zhongzheng.modules.bs.company.vo.CompanyVo;
 import com.zhongzheng.modules.bs.company.service.ICompanyService;
+import org.springframework.transaction.annotation.Transactional;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Date;
-import java.util.List;
+import java.io.IOException;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -53,7 +61,10 @@ public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> impl
     private IStaffService iStaffService;
     @Autowired
     private IBsCovenantService iBsCovenantService;
-
+    @Autowired
+    private ISysOldOrgService iSysOldOrgService;
+    @Value("${oldStudySys.getCustomerList}")
+    private String GET_CUSTOMER_LIST;
     @Override
     public CompanyVo queryById(Long companyId) {
         Company db = this.baseMapper.selectById(companyId);
@@ -103,6 +114,68 @@ public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> impl
         return companyVos;
     }
 
+    @Override
+    @Transactional
+    public boolean getYwCompany() {
+        Map<String, String> params = new HashMap<>();
+        Long nowTime = DateUtils.getNowTime();
+        String sign = ToolsUtils.EncoderByMd5(nowTime.toString() + "pubilc2022");
+        params.put("stamp", nowTime.toString());
+        params.put("sign", sign);
+        String respone = "";
+        try {
+            respone = HttpUtils.postFormBody(GET_CUSTOMER_LIST, params);
+            JSONObject jsonObject = JSON.parseObject(respone);
+            String data = jsonObject.getString("Data");
+            List<CustomerSingle> customerSingles = JSONArray.parseArray(data, CustomerSingle.class);
+            if (!customerSingles.isEmpty()){
+                customerSingles.forEach(item->{
+                    CompanyAddBo company = new CompanyAddBo();
+                    SysOldOrg serviceOne = iSysOldOrgService.getOne(new LambdaQueryWrapper<SysOldOrg>().eq(SysOldOrg::getOrgId, item.getTrainOrgId()));
+                    if (ObjectUtil.isNotEmpty(serviceOne)){
+                        if (ObjectUtil.isNotEmpty(serviceOne.getTenantId())){
+                            company.setTenantId(String.valueOf(serviceOne.getTenantId()));
+                        }
+                    }
+                    company.setOrgId((long) item.getTrainOrgId());
+                    company.setSaleId((long) item.getAdminId());
+                    company.setCompanyAddress(item.getAddress());
+                    company.setCompanyName(item.getCustomerName());
+                    company.setSaleCompanyId((long) item.getCustomerId());
+                    company.setCompanyContacts(item.getContactName());
+                    company.setContactPhone(item.getContactPhone());
+                    company.setFormId(2L);
+                    company.setCreateTime(DateUtils.getNowTime());
+                    company.setUpdateTime(DateUtils.getNowTime());
+                    this.baseMapper.insertYwCompany(company);
+                });
+            }
+
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+        return true;
+    }
+
+    @Override
+    @Transactional
+    public boolean updateYwCompany(CustomerSingle single) {
+        Boolean checked = ToolsUtils.checkSignFromOldSys(String.valueOf(single.getStamp()), single.getSign());
+        if (!checked){
+            throw new CustomException("签名错误");
+        }
+        CompanyEditBo  companyEditBo = new CompanyEditBo();
+        companyEditBo.setOrgId((long) single.getTrainOrgId());
+        companyEditBo.setSaleId((long) single.getAdminId());
+        companyEditBo.setCompanyAddress(single.getAddress());
+        companyEditBo.setCompanyName(single.getCustomerName());
+        companyEditBo.setSaleCompanyId((long) single.getCustomerId());
+        companyEditBo.setCompanyContacts(single.getContactName());
+        companyEditBo.setContactPhone(single.getContactPhone());
+        companyEditBo.setUpdateTime(DateUtils.getNowTime());
+        return this.baseMapper.updateYwCompany(companyEditBo);
+    }
+
     @Override
     public List<CovenantCompanyVo> getCovenantCompanyList(CompanyQueryBo bo) {
         bo.setStatus(1);

zhongzheng-system/src/main/java/com/zhongzheng/modules/bs/company/vo/CompanyVo.java

@@ -113,8 +113,8 @@ public class CompanyVo {
 	@Excel(name = "公司人数")
 	@ApiModelProperty("公司人数")
 	private Integer companyStaffNum;
-	/** 是否旧系统 */
-	@ApiModelProperty("是否旧系统")
+	/** 信息来源 1 企业智慧系统 2 业务系统 */
+	@ApiModelProperty("信息来源 1 企业智慧系统 2 业务系统")
 	private Long formId;
 	/** 业务员企业id */
 	@ApiModelProperty("业务员企业id")
@@ -122,6 +122,9 @@ public class CompanyVo {
 	/** 业务员id */
 	@ApiModelProperty("业务员id")
 	private Long saleId;
+	/** 业务系统机构id */
+	@ApiModelProperty("业务系统机构id")
+	private Long orgId;
 	/** 公司父子部门列表 */
 	@Excel(name = "公司父子部门列表")
 	@ApiModelProperty("公司父子部门列表")

zhongzheng-system/src/main/java/com/zhongzheng/modules/bs/company/vo/CustomerSingle.java

@@ -0,0 +1,64 @@
+package com.zhongzheng.modules.bs.company.vo;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("业务系统企业对象")
+public class CustomerSingle {
+    // 业务员对企业 id
+    @JsonProperty("CustomerId")
+    @ApiModelProperty(value = "业务员对企业")
+    private int customerId;
+    /// 企业名称
+    @JsonProperty("CustomerName")
+    @ApiModelProperty(value = "企业名称")
+    private String customerName ;
+    /// 法人
+    @JsonProperty("LegalPerson")
+    @ApiModelProperty(value = "法人")
+    private String legalPerson ;
+    /// 联系人
+    @JsonProperty("ContactName")
+    @ApiModelProperty(value = "联系人")
+    private String contactName ;
+    /// 联系电话
+    @JsonProperty("ContactPhone")
+    @ApiModelProperty(value = "联系电话")
+    private String contactPhone ;
+    /// 联系人手机
+    @JsonProperty("Mobile")
+    @ApiModelProperty(value = "联系人手机")
+    private String mobile ;
+    /// 公司地址
+    @JsonProperty("Address")
+    @ApiModelProperty(value = "公司地址")
+    private String address ;
+    /// 业务员id
+    @JsonProperty("AdminId")
+    @ApiModelProperty(value = "业务员id")
+    private int adminId;
+    /// 公海企业id
+    @JsonProperty("JCompanyId")
+    @ApiModelProperty(value = "公海企业id")
+    private int jCompanyId;
+    /// 智慧教育系统企业id
+    @JsonProperty("MemberId")
+    @ApiModelProperty(value = "智慧教育系统企业id")
+    private int memberId;
+    /// 状态，1正常，2移除
+    @JsonProperty("Status")
+    @ApiModelProperty(value = "状态，1正常，2移除")
+    private int status;
+    @JsonProperty("CustomerId")
+    @ApiModelProperty(value = "时间戳")
+    private long stamp;
+    @JsonProperty("CustomerId")
+    @ApiModelProperty(value = "签名")
+    private String sign;
+    @JsonProperty("CustomerId")
+    @ApiModelProperty(value = "业务系统企业id")
+    private int TrainOrgId;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/bs/covenant/service/impl/BsCovenantServiceImpl.java

@@ -103,6 +103,9 @@ public class BsCovenantServiceImpl extends ServiceImpl<BsCovenantMapper, BsCoven
         if (!bsCovenantVos.isEmpty()) {
             bsCovenantVos.forEach(bsCovenantVo -> {
                 SysTenant tenantId = iSysTenantService.getById(ServletUtils.getRequest().getHeader("TenantId"));
+                if (!bsCovenantVo.getCovenantImg().isEmpty()){
+                    bsCovenantVo.setCovenantImg(bsCovenantVo.getCovenantImg().replace("[","").replace("]",""));
+                }
                 String deliveryAddress = tenantId.getDeliveryAddress();
                 if (Validator.isNotEmpty(deliveryAddress)) {
                     List<TenantCovenantInfoAddBo> tenantCovenantInfoAddBos = JSONArray.parseArray(deliveryAddress, TenantCovenantInfoAddBo.class);
@@ -113,15 +116,15 @@ public class BsCovenantServiceImpl extends ServiceImpl<BsCovenantMapper, BsCoven
                     }
                 }
                 CovenantCheckRecord covenantCheckRecord = new CovenantCheckRecord();
-                if (bsCovenantVo.getStatus()==4){
+                if (bsCovenantVo.getStatus() == 4) {
                     covenantCheckRecord = iCovenantCheckRecordService.getOne(new LambdaQueryWrapper<CovenantCheckRecord>().eq(CovenantCheckRecord::getCovenantId, bsCovenantVo.getCovenantId())
-                            .eq(CovenantCheckRecord::getUserId, bo.getUserId()).eq(CovenantCheckRecord::getStatus, 1).eq(CovenantCheckRecord::getCheckStatus,1));
+                            .eq(CovenantCheckRecord::getUserId, bo.getUserId()).eq(CovenantCheckRecord::getStatus, 1).eq(CovenantCheckRecord::getCheckStatus, 1));
                 }
-                if (bsCovenantVo.getStopStatus()==3){
+                if (bsCovenantVo.getStopStatus() == 3) {
                     covenantCheckRecord = iCovenantCheckRecordService.getOne(new LambdaQueryWrapper<CovenantCheckRecord>().eq(CovenantCheckRecord::getCovenantId, bsCovenantVo.getCovenantId())
-                            .eq(CovenantCheckRecord::getUserId, bo.getUserId()).eq(CovenantCheckRecord::getStatus, 1).eq(CovenantCheckRecord::getCheckStatus,2));
+                            .eq(CovenantCheckRecord::getUserId, bo.getUserId()).eq(CovenantCheckRecord::getStatus, 1).eq(CovenantCheckRecord::getCheckStatus, 2));
                 }
-                if (ObjectUtils.isNotNull(covenantCheckRecord)){
+                if (ObjectUtils.isNotNull(covenantCheckRecord)) {
                     bsCovenantVo.setCheckRecord(covenantCheckRecord.getCheckRecord());
                 }
                 bsCovenantVo.setCycleWarning(bo.getCycleWarning());
@@ -242,7 +245,7 @@ public class BsCovenantServiceImpl extends ServiceImpl<BsCovenantMapper, BsCoven
         }
         BsCovenant add = BeanUtil.toBean(bo, BsCovenant.class);
         String companyId = ServletUtils.getRequest().getHeader("companyId");
-        if (Validator.isNotEmpty(companyId)){
+        if (Validator.isNotEmpty(companyId)) {
             add.setCompanyId(Long.valueOf(companyId));
         }
         add.setCreateTime(DateUtils.getNowTime());
@@ -358,18 +361,18 @@ public class BsCovenantServiceImpl extends ServiceImpl<BsCovenantMapper, BsCoven
     @Override
     @Transactional
     public Boolean insertYXTByAddBo(BsCovenantAddBo bo) {
-        if (bo.getFormApp()!=null&&bo.getFormApp()==3L){
-            if (bo.getUserId()==null){
+        if (bo.getFormApp() != null && bo.getFormApp() == 3L) {
+            if (bo.getUserId() == null) {
                 throw new CustomException("创建用户不能为空");
             }
         }
-        if (bo.getFormApp()!=null&&bo.getFormApp()==1L&&bo.getCovenantId() != null) {
+        if (bo.getFormApp() != null && bo.getFormApp() == 1L && bo.getCovenantId() != null) {
             BsCovenantVo bsCovenantVo = this.queryById(bo.getCovenantId());
             this.update(new LambdaUpdateWrapper<BsCovenant>().set(BsCovenant::getStatus, 7).eq(BsCovenant::getCovenantId, bsCovenantVo.getCovenantId()));
             iBsCovenantBusinessService.update(new LambdaUpdateWrapper<BsCovenantBusiness>().set(BsCovenantBusiness::getStatus, 0).eq(BsCovenantBusiness::getCovenantId, bsCovenantVo.getCovenantId()));
             iBsCovenantGoodsService.update(new LambdaUpdateWrapper<BsCovenantGoods>().eq(BsCovenantGoods::getCovenantId, bsCovenantVo.getCovenantId()).set(BsCovenantGoods::getStatus, 0));
         }
-        List<BsCovenant> bsCovenants = this.list(new LambdaQueryWrapper<BsCovenant>().eq(BsCovenant::getFormApp,bo.getFormApp()));
+        List<BsCovenant> bsCovenants = this.list(new LambdaQueryWrapper<BsCovenant>().eq(BsCovenant::getFormApp, bo.getFormApp()));
         List<String> collect = bsCovenants.stream().map(BsCovenant::getCovenantNum).collect(Collectors.toList());
         if (ObjectUtils.isNull(bo.getCovenantNum())) {
             throw new CustomException("协议编号不能为空");
@@ -527,6 +530,7 @@ public class BsCovenantServiceImpl extends ServiceImpl<BsCovenantMapper, BsCoven
     @Override
     @Transactional
     public Boolean updateByEditBo(BsCovenantEditBo bo) {
+
         if (bo.getCovenantId() == null) {
             throw new CustomException("请选择协议");
         } else {
@@ -654,7 +658,6 @@ public class BsCovenantServiceImpl extends ServiceImpl<BsCovenantMapper, BsCoven
     public String getJudgeBusiness(Long businessId, Long userId) {
         CourseBusiness courseBusiness = iCourseBusinessService.getOne(new LambdaQueryWrapper<CourseBusiness>().eq(CourseBusiness::getId, businessId).eq(CourseBusiness::getStatus, 1));
         return iBsCovenantBusinessService.getCovenantNumByProjectId(Long.valueOf(courseBusiness.getProjectId()), userId, courseBusiness.getId());
-
     }
 
     @Override
@@ -707,7 +710,6 @@ public class BsCovenantServiceImpl extends ServiceImpl<BsCovenantMapper, BsCoven
         }
         return null;
     }
-
     @Override
     public boolean updateStopStatus(Long covenantId) {
         BsCovenantVo bsCovenantVo = queryById(covenantId);
@@ -760,6 +762,7 @@ public class BsCovenantServiceImpl extends ServiceImpl<BsCovenantMapper, BsCoven
                 covenantCheckRecord.setCovenantId(noCheckInfo.getCovenantId());
                 covenantCheckRecord.setUserId(userId);
                 covenantCheckRecord.setCheckRecord(noCheckInfo.getCheckInfo());
+                covenantCheckRecord.setCheckStatus(1L);
                 covenantCheckRecord.setCreateTime(DateUtils.getNowTime());
                 covenantCheckRecord.setUpdateTime(DateUtils.getNowTime());
                 iCovenantCheckRecordService.insertByAddBo(covenantCheckRecord);
@@ -790,6 +793,7 @@ public class BsCovenantServiceImpl extends ServiceImpl<BsCovenantMapper, BsCoven
                 covenantCheckRecord.setCovenantId(noCheckInfo.getCovenantId());
                 covenantCheckRecord.setUserId(userId);
                 covenantCheckRecord.setCheckRecord(noCheckInfo.getCheckInfo());
+                covenantCheckRecord.setCheckStatus(2L);
                 covenantCheckRecord.setCreateTime(DateUtils.getNowTime());
                 covenantCheckRecord.setUpdateTime(DateUtils.getNowTime());
                 iCovenantCheckRecordService.insertByAddBo(covenantCheckRecord);

zhongzheng-system/src/main/java/com/zhongzheng/modules/bs/covenant/vo/NoCheckInfo.java

@@ -26,7 +26,7 @@ public class NoCheckInfo {
 	/** $pkColumn.columnComment */
 	@ApiModelProperty("协议id")
 	private Long covenantId;
-	@ApiModelProperty("审核状态")
+	@ApiModelProperty("协议审核状态")
 	private Integer status;
 	@ApiModelProperty("审核意见")
 	private String checkInfo;

zhongzheng-system/src/main/resources/mapper/modules/company/CompanyMapper.xml

@@ -30,6 +30,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="formId" column="form_id"/>
         <result property="saleId" column="sale_id"/>
         <result property="saleCompanyId" column="sale_company_id"/>
+        <result property="orgId" column="org_id"/>
         <result property="createTime" column="create_time"/>
         <result property="updateTime" column="update_time"/>
     </resultMap>
@@ -59,9 +60,26 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="formId" column="form_id"/>
         <result property="saleCompanyId" column="sale_company_id"/>
         <result property="saleId" column="sale_id"/>
+        <result property="orgId" column="org_id"/>
     </resultMap>
 <select id="selectCompanyList" parameterType="com.zhongzheng.modules.bs.company.domain.Company" resultMap="CompanyVoResult">
     select * from bs_company where status=1 and father_id=#{fatherId}
 </select>
-
+<insert id="insertYwCompany" parameterType="com.zhongzheng.modules.bs.company.bo.CompanyAddBo">
+    insert into bs_company (tenant_id,sale_id,company_address,company_name,sale_company_id,company_contacts,contact_phone,form_id,org_id,create_time,update_time)
+    values (#{tenantId},#{saleId},#{companyAddress},#{companyName},#{saleCompanyId},#{companyContacts},#{contactPhone},#{formId},#{orgId},#{createTime},#{updateTime})
+</insert>
+<update id="updateYwCompany" parameterType="com.zhongzheng.modules.bs.company.bo.CompanyEditBo">
+    UPDATE bs_company
+    SET
+        tenant_id = #{tenantId},
+        sale_id = #{saleId},
+        company_address = #{companyAddress},
+        company_name = #{companyName},
+        company_contacts = #{companyContacts},
+        contact_phone = #{contactPhone},
+        update_time=#{updateTime}
+    WHERE
+        sale_company_id = #{saleCompanyId}
+</update>
 </mapper>

zhongzheng-system/src/main/resources/mapper/modules/covenant/BsCovenantMapper.xml

@@ -82,9 +82,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="saleName" column="sale_name"/>
     </resultMap>
 <select id="selectByCovenantId" parameterType="com.zhongzheng.modules.bs.covenant.bo.BsCovenantQueryBo" resultMap="BsCovenantVoResult">
-    select distinct bc.* from
-        bs_covenant bc left join  bs_covenant_business bcb on bc.covenant_id=bcb.covenant_id
-    left join bs_covenant_goods bcg on bcb.covenant_business_id=bcg.covenant_business_id where 1=1
+    select  bc.* from bs_covenant bc
+    --         left join  bs_covenant_business bcb on bc.covenant_id=bcb.covenant_id
+--     left join bs_covenant_goods bcg on bcb.covenant_business_id=bcg.covenant_business_id
+      where 1=1
     <if test="covenantId != null and covenantId !=''">
         and bc.covenant_id=#{covenantId}
     </if>
@@ -101,7 +102,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         and bc.stop_status!=0  and bc.stop_status!=4 and bc.stop_status!=5
     </if>
     <if test="listType ==5">
-        and bc.upload_status!=6
+        and bc.upload_status!=6 and bc.status=2
     </if>
     <if test="userId != null and userId != ''">
         and bc.user_id=#{userId}