Browse Source

更新企业档案与面谈接口修改

anderx 9 months ago
parent
commit
4070b0e9b7

+ 1 - 1
src/main/java/com/goafanti/cognizance/service/impl/OrgCognizanceServiceImpl.java

@@ -211,7 +211,7 @@ public class OrgCognizanceServiceImpl extends BaseMybatisDao<OrgCognizanceMapper
 						StringUtils.isBlank(cog.getCertificateNumber()) ? "" : cog.getCertificateNumber());
 				o.setIssuingDate(recordTime);
 				o.setCogContacts(null == cog.getContacts() ? null : cog.getContacts());
-				organizationIdentityMapper.updateByPrimaryKeySelective(o);
+				organizationIdentityMapper.update(o);
 			}
 
 			if (OrgCognizanceStatus.getStatus(cog.getState()) == OrgCognizanceStatus.CIRCULATION) {

+ 51 - 6
src/main/java/com/goafanti/common/dao/OrganizationIdentityMapper.java

@@ -6,18 +6,61 @@ import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
+/**
+ * (OrganizationIdentity)表数据库访问层
+ *
+ * @author makejava
+ * @since 2025-04-16 11:08:21
+ */
 public interface OrganizationIdentityMapper {
-    int deleteByPrimaryKey(String id);
 
-    int insert(OrganizationIdentity record);
+    /**
+     * 通过ID查询单条数据
+     *
+     * @param id 主键
+     * @return 实例对象
+     */
+    OrganizationIdentity selectById(String id);
 
-    int insertSelective(OrganizationIdentity record);
+    
 
-    OrganizationIdentity selectByPrimaryKey(String id);
 
-    int updateByPrimaryKeySelective(OrganizationIdentity record);
 
-    int updateByPrimaryKey(OrganizationIdentity record);
+    /**
+     * 新增数据
+     *
+     * @param organizationIdentity 实例对象
+     * @return 影响行数
+     */
+    int insert(OrganizationIdentity organizationIdentity);
+
+
+    /**
+     * 批量新增或按主键更新数据(MyBatis原生foreach方法)
+     *
+     * @param entities List<OrganizationIdentity> 实例对象列表
+     * @return 影响行数
+     * @throws org.springframework.jdbc.BadSqlGrammarException 入参是空List的时候会抛SQL语句错误的异常,请自行校验入参
+     */
+    int insertOrUpdateBatch(@Param("entities") List<OrganizationIdentity> entities);
+
+    /**
+     * 修改数据
+     *
+     * @param organizationIdentity 实例对象
+     * @return 影响行数
+     */
+    int update(OrganizationIdentity organizationIdentity);
+
+    /**
+     * 通过主键删除数据
+     *
+     * @param id 主键
+     * @return 影响行数
+     */
+    int deleteById(String id);
+
+
 
     OrganizationIdentity selectOrgIdentityByUserId(String uid);
 
@@ -42,4 +85,6 @@ public interface OrganizationIdentityMapper {
     void insertBatch(List<InputUserChannel> list);
 
     List<OrganizationIdentity> selectByOrgCode(String orgCode);
+
 }
+

File diff suppressed because it is too large
+ 1655 - 1333
src/main/java/com/goafanti/common/mapper/OrganizationIdentityMapper.xml


+ 13 - 78
src/main/java/com/goafanti/common/model/OrganizationIdentity.java

@@ -4,371 +4,304 @@ import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
 
+
 /**
- * organization_identity
- * @author 
+ * (OrganizationIdentity)实体类
+ *
+ * @author makejava
+ * @since 2025-04-16 11:07:11
  */
 public class OrganizationIdentity implements Serializable {
+    private static final long serialVersionUID = 839209212752719848L;
+
     private String id;
 
     private String uid;
-
     /**
      * 联系人
      */
     private String contacts;
-
     /**
      * 联系方式
      */
     private String contactMobile;
-
     /**
      * 固定电话
      */
     private String fixedTel;
-
     /**
      * QQ号
      */
     private String qq;
-
     /**
      * 通讯地址
      */
     private String postalAddress;
-
     /**
      * 邮政编码
      */
     private String postcode;
-
     /**
      * 单位名称
      */
     private String unitName;
-
     /**
      * 注册资金
      */
     private BigDecimal registeredCapital;
-
     /**
      * 营业执照注册号
      */
     private String licenceNumber;
-
     /**
      * 营业执照所在地--省
      */
     private Integer licenceProvince;
-
     /**
      * 营业执照所在地-市
      */
     private Integer licenceCity;
-
     /**
      * 营业执照所在地-区(县)
      */
     private Integer licenceArea;
-
     /**
      * 营业执照副本扫描件URL
      */
     private String licenceScanningUrl;
-
     /**
      * 组织机构代码证号码
      */
     private String orgCode;
-
     /**
      * 组织机构代码证URL
      */
     private String orgCodeUrl;
-
     /**
      * 银行账号
      */
     private String bankAccount;
-
     /**
      * 开户行
      */
     private String banks;
-
     /**
      * 开户行支行
      */
     private String bankBranch;
-
     /**
      * 银行卡号
      */
     private String bankCardNumber;
-
     /**
      * 打入账内信息
      */
     private BigDecimal validationAmount;
-
     /**
      * 身份类型
      */
     private Integer identityType;
-
     /**
      * 开户行所在地-省
      */
     private Integer locationProvince;
-
     /**
      * 开户行所在地-市
      */
     private Integer locationCity;
-
     /**
      * 开户行所在地-区(县)
      */
     private Integer locationArea;
-
     /**
      * 法人
      */
     private String legalPerson;
-
     /**
      * 法人身份证号
      */
     private String legalPersonIdCard;
-
     /**
      * 上年度纳税报表
      */
     private String lastYearTaxReportUrl;
-
     /**
      * 审核状态
      */
     private Integer auditStatus;
-
     /**
      * 实名认证流程
      */
     private Integer process;
-
     /**
      * 输入打款金额错误次数
      */
     private Integer wrongCount;
-
     /**
      * 打款日期
      */
     private Date paymentDate;
-
     /**
      * 是否上市
      */
     private Integer listed;
-
     /**
      * 上市时间
      */
     private Date listedDate;
-
     /**
      * 上市类型
      */
     private Integer listedType;
-
     /**
      * 股票代码
      */
     private String stockCode;
-
     /**
      * 高企认定证书编号
      */
     private String certificateNumber;
-
     /**
      * 高企认定发证日期
      */
     private Date issuingDate;
-
     /**
      * 高企认定联系人及联系方式
      */
     private Integer cogContacts;
-
     /**
      * 高企技术负责人
      */
     private String techPrincipal;
-
     /**
      * 联系人固定电话
      */
     private String contactsFixedTel;
-
     /**
      * 联系人传真
      */
     private String contactsFax;
-
     /**
      * 法人电话
      */
     private String legalPersonTel;
-
     /**
      * 法人传真
      */
     private String legalPersonFax;
-
     /**
      * 法人Email
      */
     private String legalPersonEmail;
-
     /**
      * 注册时间
      */
     private Date registrationTime;
-
     /**
      * 税务登记号
      */
     private String ratepayCode;
-
     /**
      * 所属行业
      */
-    private Integer industry;
-
+    private String industry;
     /**
      * 企业规模
      */
     private String enterpriseScale;
-
     /**
      * 注册类型
      */
     private String registerType;
-
     /**
      * 外资来源地
      */
     private String foreignInvestment;
-
     /**
      * 领域
      */
     private String field;
-
     /**
      * 企业所得税主管税务机关(0--国税,1--地税)
      */
     private Integer taxAuthority;
-
     /**
      * 企业所得税征收方式(0--查账征收,1--核定征收)
      */
     private Integer ratepayMethod;
-
     /**
      * 是否属于国家级高新区内企业(0--否,1--是)
      */
     private Integer highTechZone;
-
     /**
      * 是否引入风险投资(0--否,1--是)
      */
     private Integer riskInvestment;
-
     /**
      * 经营范围
      */
     private String businessScope;
-
     /**
      * 国家级高新区名称
      */
     private String highTechName;
-
     /**
      * 专利代理委托书URL
      */
     private String patentProryStatementUrl;
-
     /**
      * 国际化(0--否 1--是)
      */
     private Integer international;
-
     /**
      * 审查说明
      */
     private String reviewInstructions;
-
     /**
      * 投资机构 0-否 1-是
      */
     private Integer investment;
-
     /**
      * 年度销售额
      */
     private BigDecimal yearSalesAmount;
-
     /**
      * 上年度研发费用
      */
     private BigDecimal lastYearResearchAmount;
-
     /**
      * 总资产情况
      */
     private BigDecimal assets;
-
     /**
      * 企业资质情况(特殊资质)
      */
     private String qualification;
-
     /**
      * 企业与高校院所(科研单位)合作情况
      */
     private String cooperationSituation;
-
     /**
      * 荣誉资质图片
      */
     private String honorPicture;
-
     /**
      * 销售目标
      */
     private String salesTarget;
-
     /**
      * 意向项目
      */
     private String intendedProject;
-
     /**
      * 联系人部门
      */
     private String contactsDep;
-
     /**
      * 联系人职位
      */
     private String contactsPosition;
 
-    private static final long serialVersionUID = 1L;
 
     public String getId() {
         return id;
@@ -754,11 +687,11 @@ public class OrganizationIdentity implements Serializable {
         this.ratepayCode = ratepayCode;
     }
 
-    public Integer getIndustry() {
+    public String getIndustry() {
         return industry;
     }
 
-    public void setIndustry(Integer industry) {
+    public void setIndustry(String industry) {
         this.industry = industry;
     }
 
@@ -953,4 +886,6 @@ public class OrganizationIdentity implements Serializable {
     public void setContactsPosition(String contactsPosition) {
         this.contactsPosition = contactsPosition;
     }
-}
+
+}
+

+ 3 - 3
src/main/java/com/goafanti/customer/bo/InputUserData.java

@@ -10,7 +10,7 @@ public class InputUserData {
    private String introduction;
    private Integer channelType;
    private String orgCode;
-   private Integer industry;
+   private String industry;
    private Integer nature;
    private String natureOther;
    private Integer enterpriseNature;
@@ -120,11 +120,11 @@ public class InputUserData {
         this.orgCode = orgCode;
     }
 
-    public Integer getIndustry() {
+    public String getIndustry() {
         return industry;
     }
 
-    public void setIndustry(Integer industry) {
+    public void setIndustry(String industry) {
         this.industry = industry;
     }
 }

+ 4 - 4
src/main/java/com/goafanti/customer/service/impl/CustomerServiceImpl.java

@@ -532,7 +532,7 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 			e.printStackTrace();
 		}
 		if (bo.getBusinessScope() != null) {
-			OrganizationIdentity use=organizationIdentityMapper.selectByPrimaryKey(bo.getId());
+			OrganizationIdentity use=organizationIdentityMapper.selectById(bo.getId());
 			if (!bo.getBusinessScope().equals(use.getBusinessScope())){
 			updateBusinessScope(bo.getUid(),bo.getBusinessScope() ,use.getBusinessScope(), date);
 			}
@@ -557,7 +557,7 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 				organizationSalesTargetMapper.insertSelective(obs);
 			}
 		}
-		organizationIdentityMapper.updateByPrimaryKeySelective(oi);
+		organizationIdentityMapper.update(oi);
 		userMapper.update(user);
 		return 1;
 	}
@@ -2787,13 +2787,13 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 	@Override
 	public int updateuserBusinessScope(String id, String businessScope) {
 		Date date =new Date();
-		OrganizationIdentity use=organizationIdentityMapper.selectByPrimaryKey(id);
+		OrganizationIdentity use=organizationIdentityMapper.selectById(id);
 		if(!businessScope.equals(use.getBusinessScope())){
 			updateBusinessScope(use.getUid(),businessScope,use.getBusinessScope(),date);
 			OrganizationIdentity oi=new OrganizationIdentity();
 			oi.setId(id);
 			oi.setBusinessScope(businessScope);
-			return organizationIdentityMapper.updateByPrimaryKeySelective(oi);
+			return organizationIdentityMapper.update(oi);
 		}
 		return 0;
 	}

+ 2 - 0
src/main/java/com/goafanti/customer/service/impl/UserArchivesServiceImpl.java

@@ -49,6 +49,8 @@ public class UserArchivesServiceImpl extends BaseMybatisDao< UserArchivesMapper>
     private OrganizationIdentityMapper organizationIdentityMapper;
     @Resource
     private DistrictGlossoryMapper districtGlossoryMapper;
+    @Resource
+    private IndustryCategoryMapper industryCategoryMapper;
 
 
 

+ 2 - 2
src/main/java/com/goafanti/patent/service/impl/PatentInfoServiceImpl.java

@@ -306,7 +306,7 @@ public class PatentInfoServiceImpl extends BaseMybatisDao<PatentInfoMapper> impl
 		if (!StringUtils.isBlank(patentInfo.getPatentProryStatementUrl())) {
 			OrganizationIdentity oi = organizationIdentityMapper.selectOrgIdentityByUserId(patentInfo.getUid());
 			oi.setPatentProryStatementUrl(patentInfo.getPatentProryStatementUrl());
-			organizationIdentityMapper.updateByPrimaryKeySelective(oi);
+			organizationIdentityMapper.update(oi);
 		}
 		createNotice(patentInfo, log);
 
@@ -330,7 +330,7 @@ public class PatentInfoServiceImpl extends BaseMybatisDao<PatentInfoMapper> impl
 		if (!StringUtils.isBlank(p.getPatentProryStatementUrl())) {
 			OrganizationIdentity oi = organizationIdentityMapper.selectOrgIdentityByUserId(p.getUid());
 			oi.setPatentProryStatementUrl(p.getPatentProryStatementUrl());
-			organizationIdentityMapper.updateByPrimaryKeySelective(oi);
+			organizationIdentityMapper.update(oi);
 		}
 
 		if (null != log.getState() && recordTime != null && StringUtils.isNotBlank(log.getPrincipal())) {

+ 7 - 7
src/main/java/com/goafanti/user/service/impl/OrganizationIdentityServiceImpl.java

@@ -64,7 +64,7 @@ public class OrganizationIdentityServiceImpl extends BaseMybatisDao<Organization
 
 	@Override
 	public int updateByPrimaryKeySelective(OrganizationIdentity organizationIdentity) {
-		return organizationIdentityMapper.updateByPrimaryKeySelective(organizationIdentity);
+		return organizationIdentityMapper.update(organizationIdentity);
 	}
 
 	@Override
@@ -83,7 +83,7 @@ public class OrganizationIdentityServiceImpl extends BaseMybatisDao<Organization
 
 	@Override
 	public int updateByPrimaryKey(OrganizationIdentity org) {
-		return organizationIdentityMapper.updateByPrimaryKey(org);
+		return organizationIdentityMapper.update(org);
 	}
 
 	@Override
@@ -111,7 +111,7 @@ public class OrganizationIdentityServiceImpl extends BaseMybatisDao<Organization
 				u.setLvl(UserLevel.CERTIFIED.getCode());
 				userMapper.update(u);
 			}
-			return organizationIdentityMapper.updateByPrimaryKeySelective(o);
+			return organizationIdentityMapper.update(o);
 		}
 	}
 
@@ -126,7 +126,7 @@ public class OrganizationIdentityServiceImpl extends BaseMybatisDao<Organization
 		if (CertifySubmitType.SUBMIT.getCode().equals(saveSign)) {
 			createAuditorNotice(user);
 		}
-		return organizationIdentityMapper.updateByPrimaryKeySelective(orgIdentity);
+		return organizationIdentityMapper.update(orgIdentity);
 
 	}
 
@@ -149,7 +149,7 @@ public class OrganizationIdentityServiceImpl extends BaseMybatisDao<Organization
 			// disposeRatePay(oi, oi.getUid());
 			createNotice(user, oi.getAuditStatus());
 		}
-		return organizationIdentityMapper.updateByPrimaryKeySelective(oi);
+		return organizationIdentityMapper.update(oi);
 	}
 
 	@Override
@@ -163,7 +163,7 @@ public class OrganizationIdentityServiceImpl extends BaseMybatisDao<Organization
 			oi.setId(UUID.randomUUID().toString());
 			organizationIdentityMapper.insert(oi);
 		} else {
-			organizationIdentityMapper.updateByPrimaryKeySelective(oi);
+			organizationIdentityMapper.update(oi);
 		}
 
 		if (StringUtils.isBlank(ohr.getId())) {
@@ -351,7 +351,7 @@ public class OrganizationIdentityServiceImpl extends BaseMybatisDao<Organization
 			oi.setUid(TokenManager.getUserId());
 			organizationIdentityMapper.insert(oi);
 		} else if (null != o && StringUtils.isNotBlank(oi.getId())) {
-			organizationIdentityMapper.updateByPrimaryKeySelective(oi);
+			organizationIdentityMapper.update(oi);
 		}
 	}