解决冲突

amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/java/com/yeejoin/amos/boot/module/jxiop/api/entity/PersonBasic.java

@@ -20,7 +20,7 @@ import java.util.List;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
-@TableName("person_basic")
+@TableName(value = "person_basic",autoResultMap = true)
 public class PersonBasic extends BaseEntity {
 
     private static final long serialVersionUID = 1L;

amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/java/com/yeejoin/amos/boot/module/jxiop/api/entity/PersonCertificate.java

@@ -8,6 +8,7 @@ import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+
 import java.util.Date;
 import java.util.List;
 
@@ -20,7 +21,7 @@ import java.util.List;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
-@TableName("person_certificate")
+@TableName(value = "person_certificate", autoResultMap = true)
 public class PersonCertificate extends BaseEntity {
 
     private static final long serialVersionUID = 1L;
@@ -28,56 +29,56 @@ public class PersonCertificate extends BaseEntity {
     /**
      * 证件类型
      */
-	@TableField("document_type")
+    @TableField("document_type")
     private String documentType;
 
     /**
      * 证书名称
      */
-	@TableField("certificate_name")
+    @TableField("certificate_name")
     private String certificateName;
 
     /**
      * 取证时间
      */
-	@TableField("certificate_time")
+    @TableField("certificate_time")
     @JsonFormat(pattern = "yyyy-MM-dd")
     private Date certificateTime;
 
     /**
      * 发证机关
      */
-	@TableField("issuing_authority")
+    @TableField("issuing_authority")
     private String issuingAuthority;
 
     /**
      * 证书编号
      */
-	@TableField("certificate_num")
+    @TableField("certificate_num")
     private String certificateNum;
 
     /**
      * 取证项目
      */
-	@TableField("certificate_project")
+    @TableField("certificate_project")
     private String certificateProject;
 
     /**
      * 有效期限
      */
-	@TableField("valid_period")
+    @TableField("valid_period")
     private String validPeriod;
 
     /**
      * 证书等级
      */
-	@TableField("certificate_grade")
+    @TableField("certificate_grade")
     private String certificateGrade;
 
     /**
      * 证书附件
      */
-	@TableField(value="certificate_attachment",typeHandler = FastjsonTypeHandler.class)
+    @TableField(value = "certificate_attachment", typeHandler = FastjsonTypeHandler.class)
     private List<CommonFile> certificateAttachment;
 
     /**

amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/java/com/yeejoin/amos/boot/module/jxiop/api/mapper/PersonBasicMapper.java

@@ -28,4 +28,5 @@ public interface PersonBasicMapper extends BaseMapper<PersonBasic> {
 
     int deleteList(String[] ids);
 
+
 }

amos-boot-system-jxiop/amos-boot-module-jxiop-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/PersonBasicController.java

@@ -67,7 +67,7 @@ public class PersonBasicController extends BaseController {
      * @return
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @DeleteMapping(value = "/{sequenceNbr}")
+    @DeleteMapping(value = "/delete")
     @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除人员基本信息", notes = "根据sequenceNbr删除人员基本信息")
     public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request,@RequestParam(value = "ids") String ids){
 		String[] idss=ids.split(",");

amos-boot-system-jxiop/amos-boot-module-jxiop-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/PersonBasicServiceImpl.java

@@ -170,7 +170,7 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto,PersonBas
         //人员基础信息
         PersonBasic personBasic = new PersonBasic();
         BeanUtils.copyProperties(personUser, personBasic);
-        this.saveOrUpdate(personBasic);
+        this.personBasicMapper.updateById(personBasic);
         //人员归属信息
         PersonAscription personAscription = new PersonAscription();
         BeanUtils.copyProperties(personUser, personAscription);
@@ -211,13 +211,13 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto,PersonBas
 
 
         QueryWrapper<PersonCertificate> wrapper4 = new QueryWrapper();
-        wrapper3.eq("person_id", sequenceNbr);
+        wrapper4.eq("person_id", sequenceNbr);
         //人员资质信息
         PersonCertificate personCertificate = personCertificateService.getOne(wrapper4);
 
 
         QueryWrapper<PersonAccount> wrapper5 = new QueryWrapper();
-        wrapper3.eq("person_id", sequenceNbr);
+        wrapper5.eq("person_id", sequenceNbr);
         //人员账号信息
         PersonAccount personAccount= personAccountService.getOne(wrapper5);
         personDto.setPersonUser(personUser);