报销人员添加初始化功能

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/reimbursementAccountant/controller/AccountantReimbursementUserController.java

@@ -124,6 +124,20 @@ public class AccountantReimbursementUserController {
         return ResponseEntity.ok (result.get("message"));
     }
 
+    /**
+     * 初始化部门人员报销数据信息（当年）
+     * @return
+     */
+    @ApiLog("初始化部门人员报销数据信息（当年）")
+    @PostMapping("initialize")
+    public ResponseEntity initialize() {
+        Map<String, Object> result = service.initialize("兴光会计");
+        Boolean success = (Boolean) result.get("success");
+        if(success){
+            return ResponseEntity.ok(result.get("message"));
+        }
+        return ResponseEntity.badRequest ().body (result.get("message"));
+    }
 
 
     /**

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/reimbursementAccountant/mapper/AccountantReimbursementUserMapper.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jeeplus.sys.service.dto.UserDTO;
 import com.jeeplus.test.reimbursementAccountant.domain.dto.AccountantReimbursementUserDTO;
+import com.jeeplus.test.reimbursementsys.domain.dto.ReimbursementUserDTO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -79,4 +80,12 @@ public interface AccountantReimbursementUserMapper extends BaseMapper<Accountant
      */
     List<UserDTO> getUserByNameAndOfficeName(AccountantReimbursementUserDTO reimbursementUserDTO);
 
+    /**
+     * 根据人员id集合和年份查询已存在的人员信息
+     * @param userIdList
+     * @param year
+     * @return
+     */
+    List<AccountantReimbursementUserDTO> getExistReimbursementUserList(@Param("userIdList") List<String> userIdList, @Param("year") String year);
+
 }

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/reimbursementAccountant/mapper/xml/AccountantReimbursementUserMapper.xml

@@ -233,4 +233,21 @@
         </where>
 
     </select>
+
+    <select id="getExistReimbursementUserList" resultType="com.jeeplus.test.reimbursementAccountant.domain.dto.AccountantReimbursementUserDTO">
+        SELECT
+        <include refid="reimbursementUserColumns"/>
+        FROM zs_reimbursement_user_accountant_info a
+        <include refid="reimbursementUserJoinColumns"/>
+        <where>
+            a.del_flag = 0
+            <if test="userIdList != null and userIdList.size>0">
+                and user_id in
+                <foreach collection="userIdList" item="userId" separator="," open="(" close=")">
+                    #{userId}
+                </foreach>
+            </if>
+            and a.year = #{year}
+        </where>
+    </select>
 </mapper>

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/reimbursementAccountant/service/AccountantReimbursementUserService.java

@@ -77,4 +77,10 @@ public interface AccountantReimbursementUserService {
      * @param reimbursementUserList
      */
     Map<String,Object> saveList(List<AccountantReimbursementUserDTO> reimbursementUserList);
+
+    /**
+     * 初始化部门人员报销数据信息（当年）
+     * @param officeName 部门名称
+     */
+    Map<String,Object> initialize(String officeName);
 }

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/reimbursementAccountant/service/impl/AccountantReimbursementUserServiceImpl.java

@@ -3,6 +3,9 @@ package com.jeeplus.test.reimbursementAccountant.service.impl;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.google.common.collect.Lists;
+import com.jeeplus.sys.service.OfficeService;
+import com.jeeplus.sys.service.UserService;
+import com.jeeplus.sys.service.dto.OfficeDTO;
 import com.jeeplus.sys.service.dto.UserDTO;
 import com.jeeplus.sys.utils.DictUtils;
 import com.jeeplus.sys.utils.StringUtils;
@@ -13,6 +16,7 @@ import com.jeeplus.test.reimbursementAccountant.domain.dto.AccountantReimburseme
 import com.jeeplus.test.reimbursementAccountant.mapper.AccountantReimbursementBusinessMapper;
 import com.jeeplus.test.reimbursementAccountant.mapper.AccountantReimbursementUserMapper;
 import com.jeeplus.test.reimbursementAccountant.service.AccountantReimbursementUserService;
+import com.jeeplus.test.reimbursementsys.domain.dto.ReimbursementUserDTO;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -20,10 +24,8 @@ import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.time.LocalDate;
+import java.util.*;
 
 /**
  * @author li-peike
@@ -42,6 +44,12 @@ public class AccountantReimbursementUserServiceImpl implements AccountantReimbur
     @Autowired
     private AccountantReimbursementBusinessMapper businessMapper;
 
+    @Autowired
+    private OfficeService officeService;
+
+    @Autowired
+    private UserService userService;
+
 
     @Override
     public AccountantReimbursementUserDTO queryById(String id) {
@@ -300,6 +308,95 @@ public class AccountantReimbursementUserServiceImpl implements AccountantReimbur
     }
 
 
+
+
+    @Override
+    @Transactional(readOnly = false)
+    public Map<String, Object> initialize(String officeName) {
+        Map<String,Object> map = new HashMap<>();
+        //根据部门名称  查询所属部门
+        List<OfficeDTO> officeListByOfficeName = officeService.getOfficeAllByOfficeName(officeName);
+        //如果不存在该部门，则进行抛出
+        if(officeListByOfficeName.size() == 0){
+            map.put("success", false);
+            map.put("message", "未查询到部门信息。");
+            return map;
+        }
+        //查询部门下所有有效人员信息
+        List<String> officeIds = Lists.newArrayList();
+        for (OfficeDTO office : officeListByOfficeName) {
+            officeIds.add(office.getId());
+        }
+        List<UserDTO> officeUserList = userService.getUserByOfficeIds(officeIds);
+        //根据部门人员查询数据库中已存在的人员信息
+        if(officeUserList.size()>0){
+            List<String> userIdList = Lists.newArrayList();
+            for (UserDTO user : officeUserList) {
+                userIdList.add(user.getId());
+            }
+            //获取当前年份
+            Calendar date = Calendar.getInstance();
+            String year = String.valueOf(date.get(Calendar.YEAR));
+
+            //根据人员id集合和年份查询已存在的人员信息
+            List<AccountantReimbursementUserDTO> existReimbursementUserList = mapper.getExistReimbursementUserList(userIdList, year);
+
+            //排除已存在的人员信息
+            for (AccountantReimbursementUserDTO existReimbursementUser: existReimbursementUserList) {
+                Iterator iterator = officeUserList.iterator();
+                while (iterator.hasNext()) {
+                    UserDTO data = (UserDTO) iterator.next();
+                    if (existReimbursementUser.getUserId().equals(data.getId())){
+                        iterator.remove();
+                        break;
+                    }
+                }
+            }
+
+            if(officeUserList.size()>0){
+                //获取日报销额度
+                String reimbursementQuotaDay = DictUtils.getDictLabel("1", "reimbursement_quota_day", null);
+                //获取当年度的总天数
+                int yearDay = LocalDate.now().lengthOfYear();
+                //获取年度休假天数
+                String holidayDay = DictUtils.getDictLabel("1", "reimbursement_holiday_day", null);
+                Integer reimbursementAllDay = yearDay;
+                if(StringUtils.isNotBlank(holidayDay)){
+                    int i = Integer.parseInt(holidayDay);
+                    reimbursementAllDay = yearDay - Integer.parseInt(holidayDay);
+                }
+                //日报销额度
+                BigDecimal reimbursementQuotaDayB = new BigDecimal(reimbursementQuotaDay);
+                //年可报销天数
+                BigDecimal reimbursementAllDayB = new BigDecimal(reimbursementAllDay);
+                //计算并赋值年报销额度
+                BigDecimal reimbursementQuotaB = reimbursementQuotaDayB.multiply(reimbursementAllDayB);
+
+
+
+                List<AccountantReimbursementUserDTO> userInfoList = Lists.newArrayList();
+
+                //将不存在数据库中的人员信息进行批量添加
+                for (UserDTO user : officeUserList) {
+                    AccountantReimbursementUserDTO userInfo = new AccountantReimbursementUserDTO();
+                    userInfo.setYear(year);
+                    userInfo.setUserId(user.getId());
+                    userInfo.setReimbursementQuotaDay(reimbursementQuotaDay);
+                    userInfo.setReimbursementAllDay(reimbursementAllDay);
+                    userInfo.setReimbursementQuota(reimbursementQuotaB.toString());
+                    userInfo.preInsert();
+                    userInfoList.add(userInfo);
+                }
+                mapper.saveList(userInfoList);
+            }
+        }
+        map.put("success", true);
+        map.put("message", "人员初始化成功");
+
+        return map;
+    }
+
+
     /**
      * 文件数据分组
      * @param dataList

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/reimbursementsys/controller/ReimbursementUserController.java

@@ -126,6 +126,22 @@ public class ReimbursementUserController {
     }
 
 
+    /**
+     * 初始化部门人员报销数据信息（当年）
+     * @return
+     */
+    @ApiLog("初始化部门人员报销数据信息（当年）")
+    @PostMapping("initialize")
+    public ResponseEntity initialize() {
+        Map<String, Object> result = service.initialize("中审众环");
+        Boolean success = (Boolean) result.get("success");
+        if(success){
+            return ResponseEntity.ok(result.get("message"));
+        }
+        return ResponseEntity.badRequest ().body (result.get("message"));
+    }
+
+
 
     /**
      * 查询报销信息

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/reimbursementsys/mapper/ReimbursementUserMapper.java

@@ -84,4 +84,12 @@ public interface ReimbursementUserMapper extends BaseMapper<ReimbursementUserDTO
      */
     List<UserDTO> getUserByNameAndOfficeName(ReimbursementUserDTO reimbursementUserDTO);
 
+    /**
+     * 根据人员id集合和年份查询已存在的人员信息
+     * @param userIdList
+     * @param year
+     * @return
+     */
+    List<ReimbursementUserDTO> getExistReimbursementUserList(@Param("userIdList") List<String> userIdList, @Param("year") String year);
+
 }

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/reimbursementsys/mapper/xml/ReimbursementUserMapper.xml

@@ -248,4 +248,21 @@
         </where>
 
     </select>
+
+    <select id="getExistReimbursementUserList" resultType="com.jeeplus.test.reimbursementsys.domain.dto.ReimbursementUserDTO">
+        SELECT
+        <include refid="reimbursementUserColumns"/>
+        FROM zs_reimbursement_user_info a
+        <include refid="reimbursementUserJoinColumns"/>
+        <where>
+            a.del_flag = 0
+            <if test="userIdList != null and userIdList.size>0">
+                and user_id in
+                <foreach collection="userIdList" item="userId" separator="," open="(" close=")">
+                    #{userId}
+                </foreach>
+            </if>
+            and a.year = #{year}
+        </where>
+    </select>
 </mapper>

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/reimbursementsys/service/ReimbursementUserService.java

@@ -90,4 +90,10 @@ public interface ReimbursementUserService {
      * @param reimbursementUserList
      */
     Map<String,Object> saveList(List<ReimbursementUserDTO> reimbursementUserList);
+
+    /**
+     * 初始化部门人员报销数据信息（当年）
+     * @param officeName 部门名称
+     */
+    Map<String,Object> initialize(String officeName);
 }

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/reimbursementsys/service/impl/ReimbursementUserServiceImpl.java

@@ -3,26 +3,26 @@ package com.jeeplus.test.reimbursementsys.service.impl;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.google.common.collect.Lists;
+import com.jeeplus.sys.service.OfficeService;
+import com.jeeplus.sys.service.UserService;
+import com.jeeplus.sys.service.dto.OfficeDTO;
 import com.jeeplus.sys.service.dto.UserDTO;
 import com.jeeplus.sys.utils.DictUtils;
 import com.jeeplus.sys.utils.StringUtils;
 import com.jeeplus.sys.utils.UserUtils;
-import com.jeeplus.test.reimbursementsys.domain.dto.ReimbursementAddressDTO;
-import com.jeeplus.test.reimbursementsys.domain.dto.ReimbursementBusinessDTO;
-import com.jeeplus.test.reimbursementsys.domain.dto.ReimbursementBusinessReturnDTO;
-import com.jeeplus.test.reimbursementsys.domain.dto.ReimbursementUserDTO;
+import com.jeeplus.test.reimbursementsys.domain.dto.*;
 import com.jeeplus.test.reimbursementsys.mapper.ReimbursementBusinessMapper;
 import com.jeeplus.test.reimbursementsys.mapper.ReimbursementUserMapper;
 import com.jeeplus.test.reimbursementsys.service.ReimbursementUserService;
 import org.apache.commons.collections4.CollectionUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.time.LocalDate;
+import java.util.*;
 
 /**
  * @author li-peike
@@ -32,6 +32,7 @@ import java.util.Map;
  * @createTime 2022年05月06日 10:38:00
  */
 @Service
+@Transactional(readOnly = true)
 public class ReimbursementUserServiceImpl implements ReimbursementUserService {
 
     @Resource
@@ -40,6 +41,12 @@ public class ReimbursementUserServiceImpl implements ReimbursementUserService {
     @Resource
     private ReimbursementBusinessMapper businessMapper;
 
+    @Autowired
+    private OfficeService officeService;
+
+    @Autowired
+    private UserService userService;
+
 
     @Override
     public ReimbursementUserDTO queryById(String id) {
@@ -65,6 +72,7 @@ public class ReimbursementUserServiceImpl implements ReimbursementUserService {
      * @param reimbursementUser
      */
     @Override
+    @Transactional(readOnly = false)
     public Map<String,Object> save(ReimbursementUserDTO reimbursementUser) {
         Map<String,Object> map = new HashMap<>();
 
@@ -122,11 +130,13 @@ public class ReimbursementUserServiceImpl implements ReimbursementUserService {
 
 
     @Override
+    @Transactional(readOnly = false)
     public void update(ReimbursementUserDTO reimbursementUser) {
         mapper.update(reimbursementUser);
     }
 
     @Override
+    @Transactional(readOnly = false)
     public Map<String,Object> delete(List<String> idList) {
         Map<String, Object> map = new HashMap<>();
         if(idList.size()>0) {
@@ -161,6 +171,7 @@ public class ReimbursementUserServiceImpl implements ReimbursementUserService {
     }
 
     @Override
+    @Transactional(readOnly = false)
     public Map<String,Object> deleteWuHan(List<String> idList) {
         Map<String,Object> map = new HashMap<>();
         List<String> userName = Lists.newArrayList();
@@ -308,6 +319,7 @@ public class ReimbursementUserServiceImpl implements ReimbursementUserService {
     }
 
     @Override
+    @Transactional(readOnly = false)
     public Map<String, Object> saveList(List<ReimbursementUserDTO> reimbursementUserList) {
 
         List<ReimbursementUserDTO> saveList = Lists.newArrayList();
@@ -378,6 +390,92 @@ public class ReimbursementUserServiceImpl implements ReimbursementUserService {
         return map;
     }
 
+    @Override
+    @Transactional(readOnly = false)
+    public Map<String, Object> initialize(String officeName) {
+        Map<String,Object> map = new HashMap<>();
+        //根据部门名称  查询所属部门
+        List<OfficeDTO> officeListByOfficeName = officeService.getOfficeAllByOfficeName(officeName);
+        //如果不存在该部门，则进行抛出
+        if(officeListByOfficeName.size() == 0){
+            map.put("success", false);
+            map.put("message", "未查询到部门信息。");
+            return map;
+        }
+        //查询部门下所有有效人员信息
+        List<String> officeIds = Lists.newArrayList();
+        for (OfficeDTO office : officeListByOfficeName) {
+            officeIds.add(office.getId());
+        }
+        List<UserDTO> officeUserList = userService.getUserByOfficeIds(officeIds);
+        //根据部门人员查询数据库中已存在的人员信息
+        if(officeUserList.size()>0){
+            List<String> userIdList = Lists.newArrayList();
+            for (UserDTO user : officeUserList) {
+                userIdList.add(user.getId());
+            }
+            //获取当前年份
+            Calendar date = Calendar.getInstance();
+            String year = String.valueOf(date.get(Calendar.YEAR));
+
+            //根据人员id集合和年份查询已存在的人员信息
+            List<ReimbursementUserDTO> existReimbursementUserList = mapper.getExistReimbursementUserList(userIdList, year);
+
+            //排除已存在的人员信息
+            for (ReimbursementUserDTO existReimbursementUser: existReimbursementUserList) {
+                Iterator iterator = officeUserList.iterator();
+                while (iterator.hasNext()) {
+                    UserDTO data = (UserDTO) iterator.next();
+                    if (existReimbursementUser.getUserId().equals(data.getId())){
+                        iterator.remove();
+                        break;
+                    }
+                }
+            }
+
+            if(officeUserList.size()>0){
+                //获取日报销额度
+                String reimbursementQuotaDay = DictUtils.getDictLabel("1", "reimbursement_quota_day", null);
+                //获取当年度的总天数
+                int yearDay = LocalDate.now().lengthOfYear();
+                //获取年度休假天数
+                String holidayDay = DictUtils.getDictLabel("1", "reimbursement_holiday_day", null);
+                Integer reimbursementAllDay = yearDay;
+                if(StringUtils.isNotBlank(holidayDay)){
+                    int i = Integer.parseInt(holidayDay);
+                    reimbursementAllDay = yearDay - Integer.parseInt(holidayDay);
+                }
+                //日报销额度
+                BigDecimal reimbursementQuotaDayB = new BigDecimal(reimbursementQuotaDay);
+                //年可报销天数
+                BigDecimal reimbursementAllDayB = new BigDecimal(reimbursementAllDay);
+                //计算并赋值年报销额度
+                BigDecimal reimbursementQuotaB = reimbursementQuotaDayB.multiply(reimbursementAllDayB);
+
+
+
+                List<ReimbursementUserDTO> userInfoList = Lists.newArrayList();
+
+                //将不存在数据库中的人员信息进行批量添加
+                for (UserDTO user : officeUserList) {
+                    ReimbursementUserDTO userInfo = new ReimbursementUserDTO();
+                    userInfo.setYear(year);
+                    userInfo.setUserId(user.getId());
+                    userInfo.setReimbursementQuotaDay(reimbursementQuotaDay);
+                    userInfo.setReimbursementAllDay(reimbursementAllDay);
+                    userInfo.setReimbursementQuota(reimbursementQuotaB.toString());
+                    userInfo.preInsert();
+                    userInfoList.add(userInfo);
+                }
+                mapper.saveList(userInfoList);
+            }
+        }
+        map.put("success", true);
+        map.put("message", "人员初始化成功");
+
+        return map;
+    }
+
 
     /**
      * 文件数据分组

jeeplus-platform/jeeplus-admin/src/main/java/com/jeeplus/sys/mapper/UserMapper.java

@@ -110,4 +110,10 @@ public interface UserMapper extends BaseMapper<User> {
      */
     List <OfficeDTO> getUserByOffice(@Param("officeIds") List<String> officeIds,@Param("type") String type);
 
+    /**
+     * 根据部门id查询部门下所有有效用户信息
+     * @param officeIds
+     * @return
+     */
+    List<UserDTO> getUserByOfficeIds(@Param("officeIds") List<String> officeIds);
 }

jeeplus-platform/jeeplus-admin/src/main/java/com/jeeplus/sys/mapper/xml/UserMapper.xml

@@ -185,6 +185,25 @@
 		</where>
 	</select>
 
+	<!-- 根据部门名称查询部门下所有有效用户信息 -->
+	<select id="getUserByOfficeIds" resultType="com.jeeplus.sys.service.dto.UserDTO">
+		SELECT
+		<include refid="userOfficeColumns"/>
+		FROM sys_user a
+		<include refid="userJoins"/>
+		<where>
+			a.del_flag = 0
+			<if test="officeIds != null and officeIds.size>0">
+				and a.office_id in
+				<foreach collection="officeIds" item="officeId" separator="," open="(" close=")">
+					#{officeId}
+				</foreach>
+			</if>
+		</where>
+	</select>
+
+
+
 
 	<!--删除用户角色关联数据-->
 	<delete id="deleteUserRole">

jeeplus-platform/jeeplus-admin/src/main/java/com/jeeplus/sys/service/UserService.java

@@ -209,5 +209,14 @@ public class UserService  extends ServiceImpl<UserMapper, User> {
 		return userMapper.getUserByOffice(officeIds,type);
 	}
 
+	/**
+	 * 根据部门id查询部门下所有有效用户信息
+	 * @param officeIds
+	 * @return
+	 */
+	public List<UserDTO> getUserByOfficeIds(List<String> officeIds){
+		return userMapper.getUserByOfficeIds(officeIds);
+	}
+
 
 }