bug调整

jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/borrow/controller/BorrowController.java

@@ -196,6 +196,29 @@ public class BorrowController {
         return ResponseEntity.ok(refundHis);
     }
 
+    /**
+     * 取消还款申请
+     * @param id
+     * @return
+     */
+    @ApiOperation(value = "取消还款申请")
+    @GetMapping("/backSourceData")
+    public ResponseEntity<Map<String, String>> backSourceData(String id){
+        Map<String, String> map = borrowService.backSourceData(id);
+        return ResponseEntity.ok(map);
+    }
+
+    /**
+     * 根据还款id查询数据
+     */
+    @ApiOperation(value = "根据还款id查询数据")
+    @GetMapping(value = "getByReId")
+    public ResponseEntity<BorrowDTO> getByReId(@RequestParam String id){
+        BorrowDTO borrowDTO=borrowService.getByReId(id);
+        return ResponseEntity.ok(borrowDTO);
+    }
+
+
 
 
 

jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/borrow/mapper/BorrowMapper.java

@@ -35,4 +35,8 @@ public interface BorrowMapper extends BaseMapper<BorrowMoney> {
     List<Refund> findByBorId(@Param("id") String id);
 
     RefundHis findHisById(@Param("id")String id);
+
+    RefundHis getByRefundId(@Param("id")String id);
+
+    BorrowDTO getByReId(@Param("id")String id);
 }

jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/borrow/mapper/xml/BorrowMapper.xml

@@ -38,7 +38,7 @@
         LEFT JOIN act_ru_task art2 ON re.proc_ins_id = art2.PROC_INST_ID_
         left join sys_user_manage_office sumo on sumo.office_id = su.office_id
         ${ew.customSqlSegment}
-        ORDER BY a.update_time DESC
+        ORDER BY a.create_time DESC
     </select>
 
     <select id="findById" resultType="com.jeeplus.business.borrow.service.dto.BorrowDTO">
@@ -50,12 +50,12 @@
             a.reason,
             a.money_lower,
             a.money,
-            a.final_money,
+            re.final_money,
             a.proc_ins_id,
             a.process_definition_id,
             a.status,
             re.borrow_id as borrowId,
-            (select sum(refund_money) from jy_refund_history where refund_id = re.id) as refundLower,
+            re.refund_lower,
             re.refund,
             re.id as refundId,
             re.proc_ins_id as procInsIdRefund,
@@ -142,6 +142,81 @@
         where a.id = #{id}
     </select>
 
+    <select id="getByRefundId" resultType="com.jeeplus.business.borrow.domain.RefundHis">
+        select
+            a.id,
+            a.create_by_id,
+            a.create_time,
+            a.refund_money,
+            a.final_money,
+            su.name as createName
+        from jy_refund_history a
+        left join sys_user su on a.create_by_id = su.id and su.del_flag = '0'
+        where a.refund_id = #{id}
+        order by a.create_time DESC limit 1
+    </select>
+    <select id="getByReId" resultType="com.jeeplus.business.borrow.service.dto.BorrowDTO">
+    SELECT
+	a.id,
+	a.create_by_id,
+	a.create_time,
+	a.NO,
+	a.reason,
+	a.money_lower,
+	a.money,
+	(
+	SELECT
+		(
+		a.money_lower - ( SELECT sum( refund_money ) FROM jy_refund_history WHERE refund_id = re.id ))) AS finalMoney,
+	a.proc_ins_id,
+	a.process_definition_id,
+	a.STATUS,
+	( SELECT sum( refund_money ) FROM jy_refund_history WHERE refund_id = re.id ) AS refundLower,
+	re.id AS refundId,
+	re.proc_ins_id AS procInsIdRefund,
+	re.process_definition_id AS procDefIdRefund,
+	re.STATUS AS refundStatus,
+	(
+	SELECT
+		dv.label
+	FROM
+		sys_dict_value dv
+		LEFT JOIN sys_dict_type dt ON dt.id = dv.dict_type_id
+	WHERE
+		dv.
+	VALUE
+		= a.STATUS
+		AND dt.type = 'program_project_list_info_status'
+	) AS borrowStatus,
+	(
+	SELECT
+		dv.label
+	FROM
+		sys_dict_value dv
+		LEFT JOIN sys_dict_type dt ON dt.id = dv.dict_type_id
+	WHERE
+		dv.
+	VALUE
+		= re.STATUS
+		AND dt.type = 'program_project_list_info_status'
+	) AS refStatus,
+	so.NAME AS officeName,
+	su.NAME AS createName
+FROM
+	jy_borrow_money a
+	LEFT JOIN jy_refund re ON a.id = re.borrow_id
+	AND re.tenant_id = '10006'
+	LEFT JOIN sys_user su ON a.create_by_id = su.id
+	AND su.del_flag = '0'
+	AND su.tenant_id = '10006'
+	LEFT JOIN sys_office so ON su.office_id = so.id
+	AND so.del_flag = '0'
+	AND so.tenant_id = '10006'
+WHERE
+	a.id = #{id}
+	 and a.del_flag = '0'
+    </select>
+
 
 
 </mapper>

jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/borrow/service/BorrowService.java

@@ -27,9 +27,8 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.util.Date;
-import java.util.List;
-import java.util.UUID;
+import java.util.*;
+
 @Service
 public class BorrowService {
 
@@ -353,4 +352,58 @@ public class BorrowService {
         RefundHis refundHis = borrowMapper.findHisById(id);
         return refundHis;
     }
+
+    /**
+     * 取消还款申请
+     * @param id
+     * @return
+     */
+    public Map<String, String> backSourceData(String id) {
+        Map<String,String> map = new HashMap<>();
+        map.put("result","error");
+        //从历史表中根据还款id查找最近一次的还款数据
+        RefundHis refundHis = borrowMapper.getByRefundId(id);
+        //如果没有最近一次还款记录,则说明是第一次还款
+        if (ObjectUtils.isEmpty(refundHis)){
+            BorrowDTO borrowDTO = this.findByRefundId(id);
+            if (ObjectUtils.isNotEmpty(borrowDTO)){
+                //将还款信息还原成初始的信息
+                Refund refund = refundMapper.selectOne(new LambdaQueryWrapper<Refund>().eq(Refund::getId, id));
+                refund.setRefundLower("");
+                refund.setRefund("");
+                refund.setFinalMoney(borrowDTO.getMoneyLower());
+                refund.setStatus("0");
+                refundMapper.updateById(refund);
+            }
+            //同时修改借款表中的剩余借款金额
+            BorrowMoney borrowMoney = new BorrowMoney();
+            borrowMoney.setId(borrowDTO.getId());
+            borrowMoney.setFinalMoney(borrowDTO.getMoneyLower());
+            map.put("result","success");
+            return map;
+        }else {
+            //如果存在,则将还款信息还原成上一次的还款记录
+            Refund refund = refundMapper.selectOne(new LambdaQueryWrapper<Refund>().eq(Refund::getId, id));
+            refund.setFinalMoney(refundHis.getFinalMoney());
+            refund.setRefundLower(refundHis.getRefundMoney());
+            refund.setStatus("5");
+            refundMapper.updateById(refund);
+            //同时修改借款表中的剩余借款金额
+            BorrowMoney borrowMoney = new BorrowMoney();
+            borrowMoney.setId(refund.getBorrowId());
+            borrowMoney.setFinalMoney(refundHis.getFinalMoney());
+            map.put("result","success");
+        }
+        return map;
+    }
+
+    /**
+     * 根据id查找所有还款金额
+     * @param id
+     * @return
+     */
+    public BorrowDTO getByReId(String id) {
+        BorrowDTO borrowDTO=borrowMapper.getByReId(id);
+        return borrowDTO;
+    }
 }

jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/holiday/service/HolidayService.java

@@ -95,72 +95,78 @@ public class HolidayService {
         UserDTO userDTO = SpringUtil.getBean ( IUserApi.class ).getByToken(TokenProvider.getCurrentToken());
         //获取当前登录人入职时间
         HolidayDTO dto=holidayMapper.findByUserId(userDTO.getId());
-        Date date=dto.getInTime();
-        LocalDate localDate = date.toInstant().atZone(ZoneId.systemDefault()).toLocalDate();
-        LocalDate intime = LocalDate.of(localDate.getYear(), localDate.getMonth(), localDate.getDayOfMonth());
-        //当前时间
-        LocalDate now = LocalDate.now();
-        //判断是否满一年
-        long yearsPassed = ChronoUnit.YEARS.between(intime, now); // 计算经过的年数
-        if (yearsPassed<1){
-            return "入职不满一年,无法休年假";
-        }
-        //计算员工入职时间距离今年还剩多少天
-        LocalDate inTime = LocalDate.of(now.getYear(), localDate.getMonth(), localDate.getDayOfMonth());
-        LocalDate endDate = LocalDate.of(now.getYear(), 12, 31);
-        long days = ChronoUnit.DAYS.between(inTime, endDate);
-        //计算今年一共有多少天
-        Calendar instance = Calendar.getInstance();
-        instance.setTime(new Date());
-        int daysInYear = instance.getActualMaximum(Calendar.DAY_OF_YEAR);
-        //判断员工入职是否满10年
-        long round=0;
-        double days1=Double.parseDouble(holidayDTO.getDays());
-        if (yearsPassed>=1 && yearsPassed<10){
-            //(当年剩余的天数/当年一共天数)*5
-            double yearDays=(double)days/daysInYear*5;
-            round = Math.round(yearDays);
-            if (days1>round){
-                return "已超出可休年假天数,当年可休年假天数为"+round+"天";
-            }
-        }else if (yearsPassed>=10){
-            //(当年距离入职时间剩余的天数/当年一共天数)*10
-            double yearDays=(double)days/daysInYear*10;
-            round = Math.round(yearDays);
-            if (days1>round){
-                return "已超出可休年假天数,当年可休年假天数为"+round+"天";
+        //判断当前登录人是否有入职时间
+        if (ObjectUtils.isNotEmpty(dto)){
+            Date date=dto.getInTime();
+            LocalDate localDate = date.toInstant().atZone(ZoneId.systemDefault()).toLocalDate();
+            LocalDate intime = LocalDate.of(localDate.getYear(), localDate.getMonth(), localDate.getDayOfMonth());
+            //当前时间
+            LocalDate now = LocalDate.now();
+            //判断是否满一年
+            long yearsPassed = ChronoUnit.YEARS.between(intime, now); // 计算经过的年数
+            if (yearsPassed<1){
+                return "入职不满一年,无法休年假";
             }
-        }
-        //当前员工当年是否休过年假
-        List<HolidayDTO> holidays = holidayMapper.selectByUserId(userDTO.getId());
-        Double holiday=0.00;
-        if (ObjectUtils.isNotEmpty(holidays)){
-            for (HolidayDTO holiday1 : holidays) {
-                //获取已经休过的年假天数
-                holiday+=Double.parseDouble(holiday1.getDays());
+            //计算员工入职时间距离今年还剩多少天
+            LocalDate inTime = LocalDate.of(now.getYear(), localDate.getMonth(), localDate.getDayOfMonth());
+            LocalDate endDate = LocalDate.of(now.getYear(), 12, 31);
+            long days = ChronoUnit.DAYS.between(inTime, endDate);
+            //计算今年一共有多少天
+            Calendar instance = Calendar.getInstance();
+            instance.setTime(new Date());
+            int daysInYear = instance.getActualMaximum(Calendar.DAY_OF_YEAR);
+            //判断员工入职是否满10年
+            long round=0;
+            double days1=Double.parseDouble(holidayDTO.getDays());
+            if (yearsPassed>=1 && yearsPassed<10){
+                //(当年剩余的天数/当年一共天数)*5
+                double yearDays=(double)days/daysInYear*5;
+                round = Math.round(yearDays);
+                if (days1>round){
+                    return "已超出可休年假天数,当年可休年假天数为"+round+"天";
+                }
+            }else if (yearsPassed>=10){
+                //(当年距离入职时间剩余的天数/当年一共天数)*10
+                double yearDays=(double)days/daysInYear*10;
+                round = Math.round(yearDays);
+                if (days1>round){
+                    return "已超出可休年假天数,当年可休年假天数为"+round+"天";
+                }
             }
-            //员工可休年假天数与已休年假天数比较 获取剩余年假天数
-            double surplus=round-holiday;
-            //如果剩余年假天数小于等于0
-            if (surplus <= 0){
-                return "当年无剩余年假,无法再休年假";
+            //当前员工当年是否休过年假
+            List<HolidayDTO> holidays = holidayMapper.selectByUserId(userDTO.getId());
+            Double holiday=0.00;
+            if (ObjectUtils.isNotEmpty(holidays)){
+                for (HolidayDTO holiday1 : holidays) {
+                    //获取已经休过的年假天数
+                    holiday+=Double.parseDouble(holiday1.getDays());
+                }
+                //员工可休年假天数与已休年假天数比较 获取剩余年假天数
+                double surplus=round-holiday;
+                //如果剩余年假天数小于等于0
+                if (surplus <= 0){
+                    return "当年无剩余年假,无法再休年假";
+                }else {
+                    //判断本次年假天数是否大于剩余年假天数
+                    if (days1>surplus){
+                        return "本次年假时间超出剩余年假天数,剩余年假"+surplus+"天";
+                    }
+                }
             }else {
-                //判断本次年假天数是否大于剩余年假天数
-                if (days1>surplus){
-                    return "本次年假时间超出剩余年假天数,剩余年假"+surplus+"天";
+                //若当年未休过年假,则计算剩余年假
+                holiday=round-days1;
+                //如果剩余年假天数小于等于0
+                if (holiday < 0){
+                    return "已超出可休年假天数,可休年假天数"+holiday+"天";
                 }
             }
-        }else {
-            //若当年未休过年假,则计算剩余年假
-            holiday=round-days1;
-            //如果剩余年假天数小于等于0
-            if (holiday < 0){
-                return "已超出可休年假天数,可休年假天数"+holiday+"天";
-            }
+            return "本次年假休息"+days1+"天,剩余年假"+holiday+"天";
         }
+        return "您的入职信息不完善,请完善后再休年假";
+
+
 
 
-       return "本次年假休息"+days1+"天,剩余年假"+holiday+"天";
 
     }
 

jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/humanResources/mapper/xml/StaffUserInfoMapper.xml

@@ -45,7 +45,7 @@
             a.fund_number,
             (case when su1.login_flag = '0' then '冻结' when su1.login_flag = '1' then '正常' else '' end) as flagName,
             a.manager_office,
-            so.name as officeName,
+            so1.name as officeName,
             su.name as createName,
             su1.login_flag,
             (select group_concat(name) from sys_role sr where FIND_IN_SET(sr.id,(select role_id from staff_user_info where id=a.id))) as roleName,
@@ -59,6 +59,7 @@
         left join sys_user su on a.create_by_id = su.id and su.del_flag = '0'
         left join sys_office so on su.office_id = so.id and so.del_flag = '0'
         left join sys_user su1 on a.user_id = su1.id and su1.del_flag = '0'
+        left join sys_office so1 on su1.office_id = so1.id and so1.del_flag = '0'
         left join jy_regular_apply ra on ra.info_id = a.id and ra.del_flag = '0'
         LEFT JOIN act_ru_task art1 ON a.proc_ins_id = art1.PROC_INST_ID_
         LEFT JOIN act_ru_task art2 ON ra.proc_ins_id = art2.PROC_INST_ID_

jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/meetingRoom/mapper/xml/MeetingRoomMapper.xml

@@ -85,7 +85,7 @@
         left join sys_user su on a.create_by_id = su.id and su.del_flag = 0
         left join sys_office so on su.office_id = so.id
         left join act_ru_task art ON a.proc_ins_id = art.PROC_INST_ID_
-        where (a.start_date=#{date}) and a.del_flag =0 and  a.`status` not in ('1', '3')
+        where (a.start_date=#{date}) and a.del_flag =0 and  a.`status` not in ('1', '3','4')
         order by a.end_time DESC
     </select>
 

jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/meetingRoom/service/MeetingRoomService.java

@@ -15,6 +15,7 @@ import com.jeeplus.core.query.QueryWrapperGenerator;
 import com.jeeplus.sys.feign.IUserApi;
 import com.jeeplus.sys.service.dto.UserDTO;
 import com.jeeplus.utils.StringUtils;
+import org.joda.time.Period;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -118,8 +119,6 @@ public class MeetingRoomService {
          //会议时长
         meetingRoom.setDuration(meetingRoomDTO.getDuration());
         meetingRoom.setRemarks(meetingRoomDTO.getRemarks()); //会议说明
-        meetingRoom.setCreateById(userDTO.getId());
-        meetingRoom.setCreateTime(new Date());
         meetingRoom.setUpdateById(userDTO.getId());
         meetingRoom.setUpdateTime(new Date());
         meetingRoom.setDelFlag(0);
@@ -128,6 +127,8 @@ public class MeetingRoomService {
         if (StringUtils.isNotBlank(meetingRoomDTO.getId())){
             meetingRoomMapper.updateById(meetingRoom);
         }else {
+            meetingRoom.setCreateById(userDTO.getId());
+            meetingRoom.setCreateTime(new Date());
             meetingRoomMapper.insert(meetingRoom);
         }
         return meetingRoom.getId();
@@ -219,12 +220,52 @@ public class MeetingRoomService {
                             break;
                         }
                     }
+
                 }else {
                     Map<String, String> emptyMap = new HashMap<>();
                     return emptyMap;
                 }
                 meetingRoomMaps.add(hashMap); // 将当前会议的映射添加到列表中
             }
+            //获取当前时间
+            LocalTime now = LocalTime.now();
+            String format1 = now.format(formatter);
+            Time nowDate = Time.valueOf(format1);
+            ArrayList<LocalTime> dateList = new ArrayList<>();
+            //判断当前时间在哪个范围内
+            if ((nowDate.after(am1) && nowDate.before(am2))){
+                // 获取时间段内的所有时间
+                LocalTime currentTime = time1;
+                while (currentTime.isBefore(time2)) {
+                    currentTime = currentTime.plus(30 * 60, ChronoUnit.SECONDS); // 每隔半小时
+                    dateList.add(currentTime);
+                }
+                //将每半个小时的时间进行遍历,与当前时间比较
+                for (LocalTime localTime : dateList) {
+                    Time time = Time.valueOf(localTime);
+                    //如果当前时间在每半小时间隔之后,则将之前的存到map中
+                    if (nowDate.after(time)){
+                        mergedMap.put(time+"",localTime.format(formatter));
+                    }
+                }
+            }
+            if ((nowDate.after(pm1) && nowDate.before(pm2))){
+                // 获取时间段内的所有时间
+                LocalTime currentTime = time3;
+                while (currentTime.isBefore(time4)) {
+                    currentTime = currentTime.plus(30 * 60, ChronoUnit.SECONDS); // 每隔半小时
+                    dateList.add(currentTime);
+                }
+                //将每半个小时的时间进行遍历,与当前时间比较
+                for (LocalTime localTime : dateList) {
+                    Time time = Time.valueOf(localTime);
+                    //如果当前时间在每半小时间隔之后,则将之前的存到map中
+                    if (nowDate.after(time)){
+                        mergedMap.put(time+"",localTime.format(formatter));
+                    }
+                }
+            }
+
             //将找到的时间重新存入到新的map中
             for (Map<String, String> map : meetingRoomMaps) {
                 for (Map.Entry<String, String> entry : map.entrySet()) {

jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/payment/mapper/xml/PaymentMapper.xml

@@ -35,7 +35,7 @@
         left join sys_user_manage_office sumo on sumo.office_id = su.office_id
         LEFT JOIN act_ru_task art1 ON a.proc_ins_id = art1.PROC_INST_ID_
         ${ew.customSqlSegment}
-        ORDER BY a.update_time DESC
+        ORDER BY a.create_time DESC
     </select>
 
 

jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/project/mapper/JyProjectMapper.java

@@ -23,7 +23,7 @@ public interface JyProjectMapper extends BaseMapper<JyProject> {
 
     List<String> getHaveProjectIds(@Param("currentUser")UserDTO userDTO);
 
-    IPage<JyWorkContractInfo> findContractPageList(Page<JyWorkContractInfo> page, @Param("dto") JyWorkContractInfoDto dto);
+    IPage<JyWorkContractInfo> findContractPageList(Page<JyWorkContractInfo> page, @Param("dto") JyWorkContractInfoDto dto,@Param(Constants.WRAPPER) QueryWrapper<JyWorkContractInfo> wrapper);
 
     Integer getProByContractId(@Param("contractId")String contractId);
     @InterceptorIgnore(tenantLine = "true")

jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/project/mapper/xml/ProjectListMapper.xml

@@ -43,20 +43,20 @@
         FROM
             jy_work_contract_info a
             LEFT JOIN sys_user b ON a.create_by_id = b.id
+            left join sys_office so on so.id = b.office_id and so.del_flag = '0'
             left join jy_work_client_info ci on ci.name= a.primary_linkman
             left join jy_work_client_linkman cl on ci.id=cl.client_id and cl.del_flag = 0
-        WHERE
-            a.del_flag = 0
+       ${ew.customSqlSegment}
+            and a.del_flag = 0
             and a.filed_type != 1
-            <if test="dto.createBy.id != null and dto.createBy.id != ''">
-                AND a.create_by_id = #{dto.createBy.id}
-            </if>
-           <if test="dto.contractName != null and dto.contractName != ''">
-               AND a.name LIKE CONCAT ('%', #{dto.contractName}, '%')
+
+           <if test="dto.name != null and dto.name != ''">
+               AND a.name LIKE CONCAT ('%', #{dto.name}, '%')
            </if>
            <if test="dto.primaryLinkman != null and dto.primaryLinkman != ''">
                AND a.primary_linkman LIKE CONCAT ('%', #{dto.primaryLinkman}, '%')
            </if>
+
             ORDER BY a.create_time DESC,cl.create_time DESC
    </select>
 

jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/project/service/JyProjectService.java

@@ -230,7 +230,10 @@ public class JyProjectService {
     }
 
     public IPage<JyWorkContractInfo> findContractPageList(JyWorkContractInfoDto dto, Page<JyWorkContractInfo> page) {
-        IPage<JyWorkContractInfo> contractPageList = jyProjectMapper.findContractPageList(page, dto);
+        UserDTO userDTO = SpringUtil.getBean(IUserApi.class).getByToken(TokenProvider.getCurrentToken());
+        QueryWrapper<JyWorkContractInfo> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("so.id",userDTO.getOfficeDTO().getId());
+        IPage<JyWorkContractInfo> contractPageList = jyProjectMapper.findContractPageList(page, dto,queryWrapper);
         contractPageList.getRecords().stream().forEach(i->{
         //合同类型查询
         StringBuffer stringBuffer = new StringBuffer();

jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/workContractInfo/service/dto/JyWorkContractInfoDto.java

@@ -171,4 +171,6 @@ public class JyWorkContractInfoDto extends BaseDTO implements Serializable {
 
     private String createName;
 
+    private String name;
+
 }