zjh
2024-06-20 6f10f16601e1ebbacba9dec18fc50c5b363aed1f
zjh 2024/06/20-1
3个文件已修改
11 ■■■■■ 已修改文件
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCustomerController.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjPackageController.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjProjectController.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCustomerController.java
@@ -5,6 +5,7 @@
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.date.DateUtil;
import cn.hutool.extra.pinyin.PinyinUtil;
import cn.hutool.json.JSONArray;
import cn.hutool.json.JSONObject;
import cn.hutool.json.JSONUtil;
@@ -314,7 +315,7 @@
                    tjCustomer1.setAge(tjReservation.getAge());
                    tjCustomer1.setAgeUnit(tjReservation.getAgeUnit());
                    tjCustomer1.setCareer(tjReservation.getCareer());
                    tjCustomer1.setPym(PinyinUtil.getFirstLetter(tjReservation.getName(),""));
                    tjCustomerService.updateById(tjCustomer1);
                    tjCustomer1.setTeamNo(tjReservation.getTeamNo());
                    tjCustomer1.setCompId(tjReservation.getCompanyId());
@@ -347,6 +348,7 @@
                substring = DigestUtils.md5DigestAsHex(substring.getBytes());
                tjCustomer.setCusPassword(substring);
                tjCustomer.setTjType(tjReservation.getTjType());
                tjCustomer.setPym(PinyinUtil.getFirstLetter(tjReservation.getName(),""));
                tjCustomerService.save(tjCustomer);
                tjCustomer.setTeamNo(tjReservation.getTeamNo());
                tjCustomer.setCompId(tjReservation.getCompanyId());
@@ -489,6 +491,7 @@
            tjCustomer.setCusBrithday(DateUtil.parse(MatchUtils.getBirthDayByIdCard(tjCustomer.getCusIdcard()), "yyyy-MM-dd"));
//        }
        tjCustomer.setCusNumber(0L);
        tjCustomer.setPym(PinyinUtil.getFirstLetter(tjCustomer.getCusName(),""));
        String config = sysConfigService.selectConfigByKey("sfkqdyhis");
        if (null != config && config.equals("Y")) {
            AjaxResult tjCustomer1 = suijieHisXinXi(tjCustomer, date);
@@ -592,6 +595,7 @@
            return AjaxResult.error("该手机号已被使用!");
        }*/
        tjCustomer.setCusPhone(cusPhone);
        tjCustomer.setPym(PinyinUtil.getFirstLetter(tjCustomer.getCusName(),""));
        if (tjCustomerService.updateById(tjCustomer)) {
            String config = sysConfigService.selectConfigByKey("sfkqdyhis");
            if (null != config && config.equals("Y")) {
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjPackageController.java
@@ -395,6 +395,7 @@
            BigDecimal money = new BigDecimal("0.00");
            tjPackage.setPrice(money);
        }
        tjPackage.setPym(PinyinUtil.getFirstLetter(tjPackage.getPacName(),""));
        if (tjPackageService.save(tjPackage)) {
            List<TjProject> tjProjectList = tjPackage.getTjProjectList();
            if (null != tjProjectList && tjProjectList.size() > 0) {
@@ -438,6 +439,7 @@
    @ApiOperation(value = "修改体检套餐")
    //@PreAuthorize("@ss.hasPermi('system:package:edit')")
    public AjaxResult edit(@RequestBody @ApiParam(value = "体检套餐对象") TjPackage tjPackage) {
        tjPackage.setPym(PinyinUtil.getFirstLetter(tjPackage.getPacName(),""));
        if (tjPackageService.updateById(tjPackage)) {
            List<TjProject> tjProjectList = tjPackage.getTjProjectList();
            if (null != tjProjectList && tjProjectList.size() > 0) {
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjProjectController.java
@@ -10,6 +10,7 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import cn.hutool.extra.pinyin.PinyinUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.ltkj.common.core.domain.entity.SysDept;
import com.ltkj.common.core.redis.RedisCache;
@@ -275,6 +276,7 @@
        if (null != tjProject.getTjStandardList() && tjProject.getTjStandardList().size() > 0) {
            tjProject.setProStandard(1);
        }
        tjProject.setProEngName(PinyinUtil.getFirstLetter(tjProject.getProName(),""));
        if (tjProjectService.save(tjProject)) {
            if (null != tjProject.getSfxmId()) {
                DictProSfxm proSfxm = new DictProSfxm();
@@ -347,6 +349,7 @@
                return AjaxResult.error("该项目正在套餐中使用,暂时不能停用");
            }
        }
        tjProject.setProEngName(PinyinUtil.getFirstLetter(tjProject.getProName(),""));
        if (tjProject.getProParentId() == 0) {
            if (tjProjectService.updateById(tjProject)) {
                if (dictProSfxmService.deletedProSfxm(tjProject.getProId())) {