更新

amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/dto/TzsUserInfoDto.java

@@ -67,4 +67,8 @@ public class TzsUserInfoDto extends BaseDto {
     @ApiModelProperty(value = "平台账号id")
     private String amosUserId;
 
+    @ApiModelProperty(value = "年龄")
+    private Integer age;
+
+
 }

amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/entity/CommonFile.java

+package com.yeejoin.amos.boot.module.tzs.api.entity;
+
+import lombok.Data;
+
+@Data
+public class CommonFile {
+
+	private static final long serialVersionUID = 1L;
+
+	private String url;
+
+	private String name;
+
+	private String uid;
+
+	private String status;
+}

amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/service/ITzsUserInfoService.java

@@ -16,6 +16,8 @@ public interface ITzsUserInfoService extends IService<TzsUserInfo> {
 
     void addQualificationsMessage(String userId, List<TzsUserQualifications> list);
 
+    void  updateQualificationsMessage(String userId, List<TzsUserQualifications> list);
+
     void deleteBatch (List<Long> ids);
 
     Map<String, Object> getDetail(Long id);

amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/controller/TzsUserInfoController.java

@@ -7,10 +7,14 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.module.tzs.api.dto.TzsUserInfoDto;
+import com.yeejoin.amos.boot.module.tzs.api.entity.CommonFile;
 import com.yeejoin.amos.boot.module.tzs.api.entity.TzsUserInfo;
 import com.yeejoin.amos.boot.module.tzs.api.entity.TzsUserQualifications;
 import com.yeejoin.amos.boot.module.tzs.api.service.ITzsUserInfoService;
 import com.yeejoin.amos.boot.module.tzs.biz.service.impl.TzsUserInfoServiceImpl;
+import com.yeejoin.amos.feign.privilege.Privilege;
+import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
+import com.yeejoin.amos.feign.privilege.model.CompanyModel;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import liquibase.pro.packaged.A;
@@ -45,13 +49,49 @@ public class TzsUserInfoController extends BaseController {
     @PostMapping(value = "/save")
     @ApiOperation(httpMethod = "POST", value = "新增人员信息", notes = "新增人员信息")
     public ResponseModel<TzsUserInfoDto> save(@RequestBody JSONObject map) {
-        Object userInfo = map.get("userInfo");
+        Map<String, Object> userInfo = (Map<String, Object>)map.get("userInfo");
         TzsUserInfoDto tzsUserInfo = JSON.parseObject(JSON.toJSONString(userInfo), TzsUserInfoDto.class);
+        AgencyUserModel me = Privilege.agencyUserClient.getme().getResult();
+        if(!ObjectUtils.isEmpty(me)){
+            List<CompanyModel> companys = me.getCompanys();
+            if (!ObjectUtils.isEmpty(companys)){
+                tzsUserInfo.setUnitName(companys.get(0).getCompanyName());
+            }
+        }
+
         Map<String, Object> qualificationsInfo = (Map<String, Object>)map.get("qualificationsInfo");
         Object subForm = qualificationsInfo.get("subForm");
         List<TzsUserQualifications> list = JSON.parseArray(JSON.toJSONString(subForm), TzsUserQualifications.class);
         tzsUserInfo = tzsUserInfoServiceImpl.createWithModel(tzsUserInfo);
-        tzsUserInfoService.addQualificationsMessage(String.valueOf(tzsUserInfo.getSequenceNbr()),list);
+        if (!ObjectUtils.isEmpty(list)){
+            tzsUserInfoService.addQualificationsMessage(String.valueOf(tzsUserInfo.getSequenceNbr()),list);
+        }
+        return ResponseHelper.buildResponse(tzsUserInfo);
+    }
+
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @PostMapping(value = "/update")
+    @ApiOperation(httpMethod = "POST", value = "修改人员信息", notes = "修改人员信息")
+    public ResponseModel<TzsUserInfo> update(@RequestBody JSONObject map,
+                                             @RequestParam Long rowId) {
+        Map<String, Object> userInfo = (Map<String, Object>)map.get("userInfo");
+        TzsUserInfo tzsUserInfo = JSON.parseObject(JSON.toJSONString(userInfo), TzsUserInfo.class);
+        AgencyUserModel me = Privilege.agencyUserClient.getme().getResult();
+        if(!ObjectUtils.isEmpty(me)){
+            List<CompanyModel> companys = me.getCompanys();
+            if (!ObjectUtils.isEmpty(companys)){
+                tzsUserInfo.setUnitName(companys.get(0).getCompanyName());
+            }
+        }
+        Map<String, Object> qualificationsInfo = (Map<String, Object>)map.get("qualificationsInfo");
+        Object subForm = qualificationsInfo.get("subForm");
+        List<TzsUserQualifications> list = JSON.parseArray(JSON.toJSONString(subForm), TzsUserQualifications.class);
+        tzsUserInfo.setSequenceNbr(rowId);
+        tzsUserInfoServiceImpl.updateById(tzsUserInfo);
+        if (!ObjectUtils.isEmpty(list)){
+            tzsUserInfoService.updateQualificationsMessage(String.valueOf(tzsUserInfo.getSequenceNbr()),list);
+        }
         return ResponseHelper.buildResponse(tzsUserInfo);
     }
 

amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/service/impl/TzsUserInfoServiceImpl.java

 package com.yeejoin.amos.boot.module.tzs.biz.service.impl;
 
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.module.tzs.api.dto.TzsUserInfoDto;
 import com.yeejoin.amos.boot.module.tzs.api.dto.TzsUserQualificationsDto;
+import com.yeejoin.amos.boot.module.tzs.api.entity.CommonFile;
 import com.yeejoin.amos.boot.module.tzs.api.entity.TzsUserInfo;
 import com.yeejoin.amos.boot.module.tzs.api.entity.TzsUserQualifications;
 import com.yeejoin.amos.boot.module.tzs.api.mapper.TzsUserInfoMapper;
@@ -19,10 +22,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.util.ObjectUtils;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 @Service
 public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserInfo, TzsUserInfoMapper> implements ITzsUserInfoService {
@@ -34,8 +34,47 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI
     private TzsUserQualificationsServiceImpl tzsUserQualificationsService;
     @Override
     public Page<TzsUserInfoDto> page(TzsUserInfoDto dto, Page<TzsUserInfoDto> page) {
+        Page<TzsUserInfoDto> tzsUserInfoDtoPage = tzsUserInfoMapper.selectPageMessage(page, dto);
+        tzsUserInfoDtoPage.getRecords().forEach(item ->{
+            if (!ObjectUtils.isEmpty(item.getProfile())){
+                List<CommonFile> commonFiles = JSON.parseArray(item.getProfile(), CommonFile.class);
+                item.setProfile(commonFiles.get(0).getUrl());
+            }
+            if (!ObjectUtils.isEmpty(item.getBirthday())){
+                int age = getAge(item.getBirthday());
+                item.setAge(Math.max(age, 0));
+            }
+        });
+        return tzsUserInfoDtoPage;
+    }
+
+
+    public int getAge(Date birth) {
+        Calendar cal = Calendar.getInstance();
+        int thisYear = cal.get(Calendar.YEAR);
+        int thisMonth = cal.get(Calendar.MONTH);
+        int dayOfMonth = cal.get(Calendar.DAY_OF_MONTH);
+
+        cal.setTime(birth);
+        int birthYear = cal.get(Calendar.YEAR);
+        int birthMonth = cal.get(Calendar.MONTH);
+        int birthdayOfMonth = cal.get(Calendar.DAY_OF_MONTH);
 
-        return tzsUserInfoMapper.selectPageMessage(page,dto);
+        int age = thisYear - birthYear;
+
+        // 未足月
+        if (thisMonth <= birthMonth) {
+            // 当月
+            if (thisMonth == birthMonth) {
+                // 未足日
+                if (dayOfMonth < birthdayOfMonth) {
+                    age--;
+                }
+            } else {
+                age--;
+            }
+        }
+        return age;
     }
 
     @Override
@@ -47,6 +86,14 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI
     }
 
     @Override
+    public void updateQualificationsMessage(String userId, List<TzsUserQualifications> list) {
+        LambdaQueryWrapper<TzsUserQualifications> lambda = new QueryWrapper<TzsUserQualifications>().lambda();
+        lambda.eq(TzsUserQualifications::getUserInfoId, userId);
+        tzsUserQualificationsService.getBaseMapper().delete(lambda);
+        addQualificationsMessage(userId, list);
+    }
+
+    @Override
     public void deleteBatch(List<Long> ids) {
         LambdaQueryWrapper<TzsUserInfo> lambda = new QueryWrapper<TzsUserInfo>().lambda();
         lambda.in(TzsUserInfo::getSequenceNbr, ids);
@@ -79,9 +126,9 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI
             vo.setFile(ObjectUtils.isEmpty(item.getFile()) ? new ArrayList() : JSON.parseArray(item.getFile()));
             tzsUserQualificationsVos.add(vo);
         });
-        HashMap<String, Object> map2 = new HashMap<>();
-        map2.put("subForm", tzsUserQualificationsVos);
-        maps.put("qualificationsInfo",map2);
+        HashMap<String, Object> subForm = new HashMap<>();
+        subForm.put("subForm", tzsUserQualificationsVos);
+        maps.put("qualificationsInfo",subForm);
         return maps;
     }
 }