保存或修改人员数据bug修改

src/main/java/com/zhgd/xmgl/modules/worker/controller/ProjectWorkerApiController.java

@@ -1,7 +1,6 @@
 package com.zhgd.xmgl.modules.worker.controller;
 
 import cn.xuyanwu.spring.file.storage.FileInfo;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.zhgd.xmgl.base.CompanyVo;
 import com.zhgd.xmgl.base.UfaceDevVo;
@@ -215,7 +214,7 @@ public class ProjectWorkerApiController {
             workerInfo.setEnterDate(workerVo.getEnterDate());
             workerInfo.setIssuingAuthorityForIdcard(workerVo.getIssuingAuthorityForIdcard());
             workerInfo.setIdCardEndDate(workerVo.getIdCardEndDate());
-            if (workerVo.getIdCardForever() == 1) {
+            if (workerVo.getIdCardForever() != null && workerVo.getIdCardForever() == 1) {
                 workerInfo.setLongTerm(1);
             } else {
                 workerInfo.setLongTerm(0);

src/main/java/com/zhgd/xmgl/modules/worker/entity/EnterpriseInfo.java

@@ -4,8 +4,6 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.zhgd.xmgl.modules.project.entity.ProjectEnterprisePerson;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -26,76 +24,112 @@ import java.util.List;
 public class EnterpriseInfo implements Serializable {
     private static final long serialVersionUID = 1L;
 
-	/**企业账号表*/
+	/**
+	 * 企业账号表
+	 */
 	@TableId(type = IdType.ASSIGN_ID)
 	@ApiModelProperty(value = "企业账号表")
 	private java.lang.Long id;
-	/**企业名称*/
+	/**
+	 * 企业名称
+	 */
 	@Excel(name = "企业名称", width = 15)
 	@ApiModelProperty(value = "企业名称")
 	private java.lang.String enterpriseName;
 
-	/**描述*/
+	/**
+	 * 描述
+	 */
 	@Excel(name = "描述", width = 15)
 	@ApiModelProperty(value = "描述")
 	private java.lang.String description;
-	/**企业地址*/
+	/**
+	 * 企业地址
+	 */
 	@Excel(name = "企业地址", width = 15)
 	@ApiModelProperty(value = "企业地址")
 	private java.lang.String enterpriseAddress;
-	/**法定代表人*/
+	/**
+	 * 法定代表人
+	 */
 	@Excel(name = "法定代表人", width = 15)
 	@ApiModelProperty(value = "法定代表人")
 	private java.lang.String enterpriseLegalPerson;
-	/**法定人证件号*/
+	/**
+	 * 法定人证件号
+	 */
 	@Excel(name = "法定人证件号", width = 15)
 	@ApiModelProperty(value = "法定人证件号")
 	private java.lang.String legalPersonIdCard;
-	/**企业安全生产许可证*/
+	/**
+	 * 企业安全生产许可证
+	 */
 	@Excel(name = "企业安全生产许可证", width = 15)
 	@ApiModelProperty(value = "企业安全生产许可证")
 	private java.lang.String enterpriseSafeAllow;
-	/**单位性质 1.国有企业 2三资企业 3集体企业 4私营企业*/
+	/**
+	 * 单位性质 1.国有企业 2三资企业 3集体企业 4私营企业
+	 */
 	@Excel(name = "单位性质 1.国有企业 2三资企业 3集体企业 4私营企业", width = 15)
 	@ApiModelProperty(value = "单位性质 1.国有企业 2三资企业 3集体企业 4私营企业")
 	private java.lang.Integer enterpriseProperty;
-	/**法人电话*/
+	/**
+	 * 法人电话
+	 */
 	@Excel(name = "法人电话", width = 15)
 	@ApiModelProperty(value = "法人电话")
 	private java.lang.String legalPersonTel;
-	/**社会统一信用代码*/
+	/**
+	 * 社会统一信用代码
+	 */
 	@Excel(name = "社会统一信用代码", width = 15)
 	@ApiModelProperty(value = "社会统一信用代码")
 	private java.lang.String socialCode;
-	/**营业执照注册号*/
+	/**
+	 * 营业执照注册号
+	 */
 	@Excel(name = "营业执照注册号", width = 15)
 	@ApiModelProperty(value = "营业执照注册号")
 	private java.lang.String businessNumber;
-	/**资质证书号*/
+	/**
+	 * 资质证书号
+	 */
 	@Excel(name = "资质证书号", width = 15)
 	@ApiModelProperty(value = "资质证书号")
 	private java.lang.String qualificationNumber;
-	/**企业邮箱*/
+	/**
+	 * 企业邮箱
+	 */
 	@Excel(name = "企业邮箱", width = 15)
 	@ApiModelProperty(value = "企业邮箱")
 	private java.lang.String enterpriseEmail;
-	/**注册资金*/
+	/**
+	 * 注册资金
+	 */
 	@Excel(name = "注册资金", width = 15)
 	@ApiModelProperty(value = "注册资金")
 	private java.lang.String registeredCapital;
-	/**开户行*/
+	/**
+	 * 开户行
+	 */
 	@Excel(name = "开户行", width = 15)
 	@ApiModelProperty(value = "开户行")
 	private java.lang.String bankname;
-	/**银行卡号*/
+	/**
+	 * 银行卡号
+	 */
 	@Excel(name = "银行卡号", width = 15)
 	@ApiModelProperty(value = "银行卡号")
 	private java.lang.String bankcardnumber;
-	/**银行代码*/
+	/**
+	 * 银行代码
+	 */
 	@Excel(name = "银行代码", width = 15)
 	@ApiModelProperty(value = "银行代码")
 	private java.lang.String bankcode;
-	/**企业资质图片地址*/
+	/**
+	 * 企业资质图片地址
+	 */
 	@Excel(name = "企业资质图片地址", width = 15)
 	@ApiModelProperty(value = "企业资质图片地址")
 	private java.lang.String enterpriseQualificationUrl  ;

src/main/java/com/zhgd/xmgl/modules/worker/entity/dto/ModGroupDto.java

@@ -17,7 +17,9 @@ socialCode	班组所属的劳务公司统一社会信用代码	string	是
     private String groupName;
     private String newGroupName;
     private String idCard;
+    @NotBlank(message = "项目编码不能为空")
     private String projectCode;
+    @NotBlank(message = "班组所属的劳务公司统一社会信用代码不能为空")
     private String socialCode;
 
 }

src/main/java/com/zhgd/xmgl/modules/worker/service/impl/TeamInfoServiceImpl.java

@@ -181,12 +181,19 @@ idCard	班组负责人身份证	string	否	如果传入班组负责人身份证
 projectCode	项目编码	String	是
 socialCode	班组所属的劳务公司统一社会信用代码	string	是
          */
+        EnterpriseInfo enterprise = enterpriseInfoMapper.selectOne(new LambdaQueryWrapper<EnterpriseInfo>().eq(EnterpriseInfo::getSocialCode, dto.getSocialCode()));
+        if (enterprise == null) {
+            resultMap.put("msg", "操作失败，班组所属的劳务公司统一社会信用代码错误了");
+            resultMap.put("status", "0");
+            return resultMap;
+        }
         TeamInfo teamInfo = teamInfoMapper.selectOne(new LambdaQueryWrapper<TeamInfo>().eq(TeamInfo::getTeamName, dto.getGroupName()));
         if (teamInfo != null) {
             //修改
             teamInfo.setTeamName(StringUtils.isNotBlank(dto.getNewGroupName()) ? dto.getNewGroupName() : dto.getGroupName());
             teamInfo.setLeaderIdCard(dto.getIdCard());
             teamInfo.setProjectSn(dto.getProjectCode());
+            teamInfo.setEnterpriseId(enterprise.getId());
             teamInfoMapper.updateById(teamInfo);
         } else {
             //新增
@@ -194,14 +201,9 @@ socialCode	班组所属的劳务公司统一社会信用代码	string	是
             teamInfo.setTeamName(dto.getGroupName());
             teamInfo.setLeaderIdCard(dto.getIdCard());
             teamInfo.setProjectSn(dto.getProjectCode());
+            teamInfo.setEnterpriseId(enterprise.getId());
             teamInfoMapper.insert(teamInfo);
         }
-        if (StringUtils.isNotBlank(dto.getSocialCode()) && teamInfo.getEnterpriseId() != null) {
-            EnterpriseInfo enterpriseInfo = new EnterpriseInfo();
-            enterpriseInfo.setId(teamInfo.getEnterpriseId());
-            enterpriseInfo.setSocialCode(dto.getSocialCode());
-            enterpriseInfoMapper.updateById(enterpriseInfo);
-        }
         try {
             resultMap.put("msg", "操作成功");
             resultMap.put("status", "1");