zjh 2024/08/02-1

zjh

2024-08-02 7dcc5427cfafc4d2ba346e05c340c598fc386009

zjh 2024/08/02-1

 ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCustomerController.java

@@ -4,6 +4,7 @@
import javax.servlet.http.HttpServletResponse;

import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.date.DateUnit;
import cn.hutool.core.date.DateUtil;
import cn.hutool.extra.pinyin.PinyinUtil;
import cn.hutool.json.JSONArray;
@@ -215,7 +216,8 @@
//                if (DateUtil.endOfDay(new Date()).before(tjReservation.getReservationTime())) {
//                    return AjaxResult.error("未到预约时间");
//                }
                if (null != tjReservation.getReservationTime() && DateUtil.endOfDay(tjReservation.getReservationTime()).before(new Date())) {
                if (null != tjReservation.getReservationTime() && DateUtil.endOfDay(DateUtil.offsetDay(tjReservation.getReservationTime(),
                        tjReservation.getYxts())).before(new Date())) {
                    tjReservation.setIsExpire(1);
                    tjReservationService.updateById(tjReservation);
                    return AjaxResult.error("对不起您的预约已超时请重新预约");

 ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java

@@ -905,7 +905,7 @@
//            if (DateUtil.endOfDay(new Date()).before(tjReservation.getReservationTime())) {
//                return AjaxResult.error("未到预约时间");
//            }
            if (DateUtil.endOfDay(tjReservation.getReservationTime()).before(new Date())) {
            if (DateUtil.endOfDay(DateUtil.offsetDay(tjReservation.getReservationTime(),tjReservation.getYxts())).before(new Date())) {
                tjReservation.setIsExpire(1);
                tjReservationService.updateById(tjReservation);
                return AjaxResult.error("对不起您的预约已超时请重新预约");

 ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReservationController.java

@@ -456,6 +456,7 @@
     */
    @PostMapping("/tjReappoint")
    @ApiOperation(value = "体检预约修改接口")
    @Transactional
    public AjaxResult tjReappoint(@RequestBody TjReservation tjReservation) {
        TjReservation reservation = tjReservationService.getById(tjReservation.getId());

@@ -468,7 +469,7 @@
        if (tjReservationService.updateById(tjReservation)) {
            taskService.removeTask(new TjReservationTask(tjReservation.getId()));
            taskService.addTask(new TjReservationTask(tjReservation.getId(),
                    DateUtil.between(new Date(),DateUtil.endOfDay(tjReservation.getReservationTime()), DateUnit.MS)));
                    DateUtil.between(new Date(),DateUtil.endOfDay(DateUtil.offsetDay(tjReservation.getReservationTime(),reservation.getYxts())), DateUnit.MS)));
            return AjaxResult.success("操作成功");
        }
        return AjaxResult.error("操作失败");
@@ -560,8 +561,9 @@
                tramNum+=1;
                reservation.setTjType(String.valueOf(1));
                reservation.setTeamNo(teamNo);
                reservation.setYxts(dto.getYxts());
                tjReservationService.save(reservation);
                taskService.addTask(new TjReservationTask(reservation.getId(),DateUtil.between(new Date(),DateUtil.endOfDay(reservation.getReservationTime()), DateUnit.MS)));
                taskService.addTask(new TjReservationTask(reservation.getId(),DateUtil.between(new Date(),DateUtil.endOfDay(DateUtil.offsetDay(reservation.getReservationTime(),dto.getYxts())), DateUnit.MS)));
            }
            LambdaQueryWrapper<TjCompPay> wq0 = new LambdaQueryWrapper<>();
            wq0.eq(TjCompPay::getCompId, dwDept.getDwId());

 ltkj-admin/src/main/resources/application.yml

@@ -4,4 +4,4 @@
#test 泾川县部署测试环境使用
spring:
  profiles:
    active: dev
    active: prod

 ltkj-admin/src/test/java/zjhTest.java

@@ -122,33 +122,9 @@


        public static void main(String[] args) {
            // 初始数据库配置
            String initialUrl = "jdbc:mysql://initial_host:3306/initial_db";
            String username = "user";
            String password = "pass";

            // 新数据库配置
            String newUrl = "jdbc:mysql://new_host:3306/new_db";

            // 更改连接URL
            String urlToUse = initialUrl; // 可以根据需要切换到newUrl

            // 创建数据库连接属性
            Properties props = new Properties();
            props.setProperty("user", username);
            props.setProperty("password", password);

            try {
                // 连接到数据库
                Connection conn = DriverManager.getConnection(urlToUse, props);

                // 使用conn进行数据库操作...

                // 关闭连接
                conn.close();
            } catch (SQLException e) {
                e.printStackTrace();
            }
//            System.out.println(DateUtil.date());
//            System.out.println(DateUtil.offsetDay(DateUtil.date(),1));
//            System.out.println(DateUtil.offsetDay(DateUtil.date(),0));
        }



 ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjReservation.java

@@ -330,6 +330,9 @@
    @ApiModelProperty("索引卡号")
    private String indexCard;

    @ApiModelProperty("有效天数")
    private Integer yxts;



    @Override

 ltkj-hosp/src/main/java/com/ltkj/hosp/dto/ConfirmDto.java

@@ -57,4 +57,10 @@
     */
    @ApiModelProperty(value = "支付方式 0自费1公司付款")
    private Integer payType;

    /**
     * 有效天数
     */
    @ApiModelProperty(value = "有效天数")
    private Integer yxts;
}