diff --git a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/controller/BaseTimeZoneController.java b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/controller/BaseTimeZoneController.java index cefb07b..10dd529 100644 --- a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/controller/BaseTimeZoneController.java +++ b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/controller/BaseTimeZoneController.java @@ -70,7 +70,7 @@ public class BaseTimeZoneController extends BaseController { **/ @GetMapping("/listZone") public AjaxResult listZone() { - return success(baseTimeZoneService.list()); + return success(baseTimeZoneService.listAllZoneAndTime()); } diff --git a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/domain/BaseTimeZone.java b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/domain/BaseTimeZone.java index 5e01041..18a1005 100644 --- a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/domain/BaseTimeZone.java +++ b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/domain/BaseTimeZone.java @@ -31,6 +31,10 @@ public class BaseTimeZone @Excel(name = "时区标准名称", readConverterExp = "如=,“=Asia/Shanghai”，遵循,I=ANA,时=区数据库命名规范") private String zoneName; + /** 时区中文 */ + @Excel(name = "时区中文") + private String zoneCn; + /** UTC 偏移量（如 “+08:00”“-05:00”“+03:30”） */ @Excel(name = "UTC 偏移量", readConverterExp = "如=,“=+08:00”“-05:00”“+03:30”") private String utcOffset; diff --git a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/service/IBaseTimeZoneService.java b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/service/IBaseTimeZoneService.java index 3e57367..c513a1e 100644 --- a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/service/IBaseTimeZoneService.java +++ b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/service/IBaseTimeZoneService.java @@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.base.domain.BaseTimeZone; import com.ruoyi.base.vo.BaseCountryVO; +import com.ruoyi.base.vo.TimeZoneVO; /** * 时区Service接口 @@ -25,4 +26,13 @@ public interface IBaseTimeZoneService extends IService { * @date 15:34 2025/11/17 **/ IPage queryListPage(BaseTimeZone pageReqVO, Page page); + + /** + * 获取时区列表--含当前时间 + * + * @return com.ruoyi.base.vo.BaseCountryVO + * @author PQZ + * @date 15:02 2025/11/17 + **/ + List listAllZoneAndTime(); } diff --git a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/service/impl/BaseTimeZoneServiceImpl.java b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/service/impl/BaseTimeZoneServiceImpl.java index d568051..b402656 100644 --- a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/service/impl/BaseTimeZoneServiceImpl.java +++ b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/service/impl/BaseTimeZoneServiceImpl.java @@ -1,10 +1,14 @@ package com.ruoyi.base.service.impl; +import java.util.ArrayList; import java.util.List; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.base.vo.BaseCountryVO; +import com.ruoyi.base.vo.TimeZoneVO; +import com.ruoyi.utils.DateTimeUtil; +import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -22,6 +26,8 @@ import com.ruoyi.base.service.IBaseTimeZoneService; public class BaseTimeZoneServiceImpl extends ServiceImpl implements IBaseTimeZoneService { @Autowired private BaseTimeZoneMapper baseTimeZoneMapper; + @Autowired + private DateTimeUtil dateTimeUtil; /** * 分页查询时区列表 @@ -36,4 +42,26 @@ public class BaseTimeZoneServiceImpl extends ServiceImpl queryListPage(BaseTimeZone pageReqVO, Page page) { return baseTimeZoneMapper.queryListPage(pageReqVO, page); } + + /** + * 获取时区列表--含当前时间 + * + * @return com.ruoyi.base.vo.BaseCountryVO + * @author PQZ + * @date 15:02 2025/11/17 + **/ + @Override + public List listAllZoneAndTime() { + List list = this.list(); + List rtnList = new ArrayList<>(); + for (BaseTimeZone item : list) { + TimeZoneVO vo = new TimeZoneVO(); + BeanUtils.copyProperties(item, vo); + vo.setNowTime(dateTimeUtil.getZoneTime(item.getZoneName())); + rtnList.add(vo); + } + //按时间先后排序 + rtnList.sort((o1, o2) -> o1.getNowTime().compareTo(o2.getNowTime())); + return rtnList; + } } diff --git a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/vo/TimeZoneVO.java b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/vo/TimeZoneVO.java new file mode 100644 index 0000000..7fdddf1 --- /dev/null +++ b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/vo/TimeZoneVO.java @@ -0,0 +1,14 @@ +package com.ruoyi.base.vo; + +import com.ruoyi.base.domain.BaseTimeZone; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.TimeZone; + +@EqualsAndHashCode(callSuper = true) +@Data +public class TimeZoneVO extends BaseTimeZone { + /** 当前时间*/ + private String nowTime; +} diff --git a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/cus/controller/CusMainController.java b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/cus/controller/CusMainController.java index fcb4b0e..8477e9c 100644 --- a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/cus/controller/CusMainController.java +++ b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/cus/controller/CusMainController.java @@ -19,9 +19,7 @@ import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.StringUtils; import com.ruoyi.cus.domain.CusMainSeas; import com.ruoyi.cus.domain.CusTimeAxis; -import com.ruoyi.cus.service.ICusImportService; -import com.ruoyi.cus.service.ICusMainSeasService; -import com.ruoyi.cus.service.ICusTimeAxisService; +import com.ruoyi.cus.service.*; import com.ruoyi.cus.vo.CusMainVO; import com.ruoyi.cus.vo.MainVO; import com.ruoyi.utils.CodeGenerator; @@ -42,7 +40,6 @@ import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.cus.domain.CusMain; -import com.ruoyi.cus.service.ICusMainService; import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.common.core.page.TableDataInfo; import org.springframework.web.multipart.MultipartFile; @@ -66,6 +63,16 @@ public class CusMainController extends BaseController { private ICusTimeAxisService cusTimeAxisService; @Autowired private ICusMainSeasService cusMainSeasService; + @Autowired + private ICusManagerService cusManagerService; + @Autowired + private ICusCompanyService cusCompanyService; + @Autowired + private ICusMarkService cusMarkService; + @Autowired + private ICusContactsService cusContactsService; + @Autowired + private ICusBankService cusBankService; /** * 生成客户编码 @@ -232,20 +239,32 @@ public class CusMainController extends BaseController { /** - * 删除客户信息 + * 删除客户信息---只会单个删除 */ @PreAuthorize("@ss.hasPermi('cus:main:remove')") @Log(title = "客户信息", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public AjaxResult remove(@PathVariable String[] ids) { List list = new ArrayList<>(Arrays.asList(ids)); + String cusId = list.get(0); //时间轴信息 CusTimeAxis cusTimeAxis = new CusTimeAxis(); cusTimeAxis.setBusiMaxCatg("客户"); cusTimeAxis.setBusiCatg("修改"); cusTimeAxis.setContent("删除客户信息"); - cusTimeAxis.setCusId(list.get(0)); + cusTimeAxis.setCusId(cusId); cusTimeAxisService.saveNewTimeAxis(cusTimeAxis); + + //删除其他子表信息-删除管理信息 + cusManagerService.deleteCusData(cusId); + //删除公司信息 + cusCompanyService.deleteCusData(cusId); + //删除联系人信息 + cusContactsService.deleteCusData(cusId); + //删除唛头信息 + cusMarkService.deleteCusMark(cusId); + //删除银行信息 + cusBankService.deleteCusData(cusId); return toAjax(cusMainService.removeByIds(list)); } diff --git a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/cus/controller/CusMainSeasController.java b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/cus/controller/CusMainSeasController.java index 83343bc..0056857 100644 --- a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/cus/controller/CusMainSeasController.java +++ b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/cus/controller/CusMainSeasController.java @@ -10,8 +10,7 @@ import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.cus.domain.CusMain; import com.ruoyi.cus.domain.CusTimeAxis; -import com.ruoyi.cus.service.ICusMainService; -import com.ruoyi.cus.service.ICusTimeAxisService; +import com.ruoyi.cus.service.*; import com.ruoyi.cus.vo.MainVO; import org.springframework.beans.BeanUtils; import org.springframework.security.access.prepost.PreAuthorize; @@ -30,7 +29,6 @@ import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.cus.domain.CusMainSeas; -import com.ruoyi.cus.service.ICusMainSeasService; import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.common.core.page.TableDataInfo; @@ -49,6 +47,16 @@ public class CusMainSeasController extends BaseController { private ICusMainService cusMainService; @Autowired private ICusTimeAxisService cusTimeAxisService; + @Autowired + private ICusManagerService cusManagerService; + @Autowired + private ICusCompanyService cusCompanyService; + @Autowired + private ICusMarkService cusMarkService; + @Autowired + private ICusContactsService cusContactsService; + @Autowired + private ICusBankService cusBankService; /** * 查询公海客户信息列表 @@ -117,13 +125,25 @@ public class CusMainSeasController extends BaseController { @DeleteMapping("/{ids}") public AjaxResult remove(@PathVariable String[] ids) { List list = new ArrayList<>(Arrays.asList(ids)); + String cusId = list.get(0); //时间轴信息 CusTimeAxis cusTimeAxis = new CusTimeAxis(); cusTimeAxis.setBusiMaxCatg("客户"); cusTimeAxis.setBusiCatg("修改"); cusTimeAxis.setContent("删除公海客户信息"); - cusTimeAxis.setCusId(list.get(0)); + cusTimeAxis.setCusId(cusId); cusTimeAxisService.saveNewTimeAxis(cusTimeAxis); + + //删除其他子表信息-删除管理信息 + cusManagerService.deleteCusData(cusId); + //删除公司信息 + cusCompanyService.deleteCusData(cusId); + //删除联系人信息 + cusContactsService.deleteCusData(cusId); + //删除唛头信息 + cusMarkService.deleteCusMark(cusId); + //删除银行信息 + cusBankService.deleteCusData(cusId); return toAjax(cusMainSeasService.removeByIds(list)); } diff --git a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/cus/mapper/CusBankMapper.java b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/cus/mapper/CusBankMapper.java index 5d7e771..1abdca1 100644 --- a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/cus/mapper/CusBankMapper.java +++ b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/cus/mapper/CusBankMapper.java @@ -18,4 +18,12 @@ import org.apache.ibatis.annotations.Mapper; public interface CusBankMapper extends BaseMapper { IPage queryListPage(@Param("entity") CusBank entity, Page page); + + /** + * 删除客户银行信息 + * @author vinjor-M + * @date 10:14 2025/11/24 + * @return int + **/ + int deleteCusData(String cusId); } diff --git a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/cus/mapper/CusCompanyMapper.java b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/cus/mapper/CusCompanyMapper.java index e06f0d3..9c3abe8 100644 --- a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/cus/mapper/CusCompanyMapper.java +++ b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/cus/mapper/CusCompanyMapper.java @@ -18,4 +18,12 @@ import org.apache.ibatis.annotations.Mapper; public interface CusCompanyMapper extends BaseMapper { IPage queryListPage(@Param("entity") CusCompany entity, Page page); + + /** + * 删除客户公司信息 + * @author vinjor-M + * @date 10:14 2025/11/24 + * @return int + **/ + int deleteCusData(String cusId); } diff --git a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/cus/mapper/CusContactsMapper.java b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/cus/mapper/CusContactsMapper.java index 78dc9fa..bccf5e8 100644 --- a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/cus/mapper/CusContactsMapper.java +++ b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/cus/mapper/CusContactsMapper.java @@ -27,4 +27,12 @@ public interface CusContactsMapper extends BaseMapper * @return void **/ void updateOtherDefault(@Param("cusId") String cusId); + + /** + * 删除客户联系人信息 + * @author vinjor-M + * @date 10:14 2025/11/24 + * @return int + **/ + int deleteCusData(String cusId); } diff --git a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/cus/mapper/CusManagerMapper.java b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/cus/mapper/CusManagerMapper.java index 041e960..1096718 100644 --- a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/cus/mapper/CusManagerMapper.java +++ b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/cus/mapper/CusManagerMapper.java @@ -26,4 +26,12 @@ public interface CusManagerMapper extends BaseMapper * @return int **/ int updateByCusId(@Param("entity") CusManager entity); + + /** + * 删除客户管理信息 + * @author vinjor-M + * @date 10:14 2025/11/24 + * @return int + **/ + int deleteCusData(String cusId); } diff --git a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/cus/mapper/CusMarkMapper.java b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/cus/mapper/CusMarkMapper.java index a7c1459..1a8e643 100644 --- a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/cus/mapper/CusMarkMapper.java +++ b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/cus/mapper/CusMarkMapper.java @@ -18,4 +18,13 @@ import org.apache.ibatis.annotations.Mapper; public interface CusMarkMapper extends BaseMapper { IPage queryListPage(@Param("entity") CusMark entity, Page page); + + /** + * 删除客户唛头信息 + * @author vinjor-M + * @date 9:34 2025/11/26 + * @param cusId TODO + * @return int + **/ + int deleteCusMark(@Param("cusId") String cusId); } diff --git a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/cus/service/ICusBankService.java b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/cus/service/ICusBankService.java index be7239b..6d06e56 100644 --- a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/cus/service/ICusBankService.java +++ b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/cus/service/ICusBankService.java @@ -25,4 +25,12 @@ public interface ICusBankService extends IService { * @date 15:58 2025/11/20 **/ void saveOrUpdateByAccount(List cusBankList); + + /** + * 根据客户id删除数据 + * @author vinjor-M + * @date 9:20 2025/11/26 + * @param cusId 客户id + **/ + void deleteCusData(String cusId); } diff --git a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/cus/service/ICusCompanyService.java b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/cus/service/ICusCompanyService.java index 459f298..9fc6d35 100644 --- a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/cus/service/ICusCompanyService.java +++ b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/cus/service/ICusCompanyService.java @@ -25,4 +25,12 @@ public interface ICusCompanyService extends IService { * @date 15:15 2025/11/20 **/ void saveOrUpdateByCusName(List cusCompanyList); + + /** + * 根据客户id删除数据 + * @author vinjor-M + * @date 9:20 2025/11/26 + * @param cusId 客户id + **/ + void deleteCusData(String cusId); } diff --git a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/cus/service/ICusContactsService.java b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/cus/service/ICusContactsService.java index dc62f1a..9145163 100644 --- a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/cus/service/ICusContactsService.java +++ b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/cus/service/ICusContactsService.java @@ -40,4 +40,12 @@ public interface ICusContactsService extends IService { * @param cusId TODO **/ void updateOtherDefault(String cusId); + + /** + * 根据客户id删除数据 + * @author vinjor-M + * @date 9:20 2025/11/26 + * @param cusId 客户id + **/ + void deleteCusData(String cusId); } diff --git a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/cus/service/ICusManagerService.java b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/cus/service/ICusManagerService.java index 5290db9..a0abd3a 100644 --- a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/cus/service/ICusManagerService.java +++ b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/cus/service/ICusManagerService.java @@ -32,4 +32,12 @@ public interface ICusManagerService extends IService { * @date 10:13 2025/11/24 **/ void updateByCusId(CusManager cusManager); + + /** + * 根据客户id删除数据 + * @author vinjor-M + * @date 9:20 2025/11/26 + * @param cusId 客户id + **/ + void deleteCusData(String cusId); } diff --git a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/cus/service/ICusMarkService.java b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/cus/service/ICusMarkService.java index 1decb95..a5df947 100644 --- a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/cus/service/ICusMarkService.java +++ b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/cus/service/ICusMarkService.java @@ -15,4 +15,12 @@ import com.ruoyi.cus.domain.CusMark; public interface ICusMarkService extends IService { IPage queryListPage(CusMark pageReqVO, Page page); + + /** + * 根据客户id删除数据 + * @author vinjor-M + * @date 9:20 2025/11/26 + * @param cusId 客户id + **/ + void deleteCusMark(String cusId); } diff --git a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/cus/service/impl/CusBankServiceImpl.java b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/cus/service/impl/CusBankServiceImpl.java index 4e837d4..1dd8728 100644 --- a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/cus/service/impl/CusBankServiceImpl.java +++ b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/cus/service/impl/CusBankServiceImpl.java @@ -98,4 +98,15 @@ public class CusBankServiceImpl extends ServiceImpl impl } } + /** + * 根据客户id删除数据 + * + * @param cusId 客户id + * @author vinjor-M + * @date 9:20 2025/11/26 + **/ + @Override + public void deleteCusData(String cusId) { + cusBankMapper.deleteCusData(cusId); + } } diff --git a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/cus/service/impl/CusCompanyServiceImpl.java b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/cus/service/impl/CusCompanyServiceImpl.java index 2ffa60b..50e3109 100644 --- a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/cus/service/impl/CusCompanyServiceImpl.java +++ b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/cus/service/impl/CusCompanyServiceImpl.java @@ -97,4 +97,15 @@ public class CusCompanyServiceImpl extends ServiceImpl impl private ICusMainSeasService cusMainSeasService; @Autowired private ISysUserService sysUserService; + @Autowired + private DateTimeUtil dateTimeUtil; @Override public IPage queryListPage(MainVO pageReqVO, Page page) { @@ -253,15 +256,17 @@ public class CusMainServiceImpl extends ServiceImpl impl //查公海客户信息 CusMainSeas cusMainSeas = cusMainSeasService.getById(id); BeanUtils.copyProperties(cusMainSeas, mainVO); - mainVO.setCusLabelList(JSON.parseArray(cusMainSeas.getCusLabels())); - cusViewVO.setCusMain(mainVO); }else{ //正常客户 CusMain cusMain = this.getById(id); BeanUtils.copyProperties(cusMain, mainVO); - mainVO.setCusLabelList(JSON.parseArray(cusMain.getCusLabels())); - cusViewVO.setCusMain(mainVO); } + mainVO.setCusLabelList(JSON.parseArray(mainVO.getCusLabels())); + //设置客户当前时间 + if(StringUtils.isNotEmpty(mainVO.getZoneName())){ + mainVO.setNowTime(dateTimeUtil.getZoneTime(mainVO.getZoneName())); + } + cusViewVO.setCusMain(mainVO); //2.客户联系人信息 CusContacts contacts = new CusContacts(); contacts.setCusId(id); diff --git a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/cus/service/impl/CusManagerServiceImpl.java b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/cus/service/impl/CusManagerServiceImpl.java index 7c4a1b6..27d7083 100644 --- a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/cus/service/impl/CusManagerServiceImpl.java +++ b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/cus/service/impl/CusManagerServiceImpl.java @@ -108,4 +108,16 @@ public class CusManagerServiceImpl extends ServiceImpl impl public IPage queryListPage(CusMark pageReqVO, Page page) { return cusMarkMapper.queryListPage(pageReqVO, page); } + + /** + * 根据客户id删除数据 + * + * @param cusId 客户id + * @author vinjor-M + * @date 9:20 2025/11/26 + **/ + @Override + public void deleteCusMark(String cusId) { + cusMarkMapper.deleteCusMark(cusId); + } + } diff --git a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/cus/vo/MainVO.java b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/cus/vo/MainVO.java index 425146a..45dcc77 100644 --- a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/cus/vo/MainVO.java +++ b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/cus/vo/MainVO.java @@ -42,4 +42,7 @@ public class MainVO extends CusMain { /** 最近联系时间 */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date contactTime; + + /** 客户所在时区当前时间 */ + private String nowTime; } diff --git a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/utils/DateTimeUtil.java b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/utils/DateTimeUtil.java new file mode 100644 index 0000000..e74089e --- /dev/null +++ b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/utils/DateTimeUtil.java @@ -0,0 +1,30 @@ +package com.ruoyi.utils; + +import org.springframework.stereotype.Component; + +import java.time.ZoneId; +import java.time.ZonedDateTime; +import java.time.format.DateTimeFormatter; + +@Component +public class DateTimeUtil { + + /** + * 获取某时区当前时间 + * @author vinjor-M + * @date 10:50 2025/11/26 + * @param zoneName TODO + * @return java.lang.String + **/ + public String getZoneTime(String zoneName){ + // 1. 定义目标时区ID（推荐使用 IANA 时区ID，避免旧版 ID 兼容问题） + ZoneId zoneId = ZoneId.of(zoneName); + + // 2. 获取该时区的当前时间（ZonedDateTime 包含 日期+时间+时区+偏移量） + ZonedDateTime zonedDateTime = ZonedDateTime.now(zoneId); + + // 3. （可选）格式化时间为自定义格式（如：yyyy-MM-dd HH:mm:ss zzzz） + DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss zzzz"); + return zonedDateTime.format(formatter); + } +} diff --git a/dl_admin/ruoyi-admin/src/main/resources/mapper/base/BaseTimeZoneMapper.xml b/dl_admin/ruoyi-admin/src/main/resources/mapper/base/BaseTimeZoneMapper.xml index c12265a..1338ee4 100644 --- a/dl_admin/ruoyi-admin/src/main/resources/mapper/base/BaseTimeZoneMapper.xml +++ b/dl_admin/ruoyi-admin/src/main/resources/mapper/base/BaseTimeZoneMapper.xml @@ -7,6 +7,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -15,13 +16,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select id, zone_name, utc_offset, abbreviation, uses_dst, dst_offset, description from base_time_zone + select id, zone_name, zone_cn,utc_offset, abbreviation, uses_dst, dst_offset, description from base_time_zone \ No newline at end of file diff --git a/dl_admin/ruoyi-admin/src/main/resources/mapper/cus/CusBankMapper.xml b/dl_admin/ruoyi-admin/src/main/resources/mapper/cus/CusBankMapper.xml index 7856a84..c29de08 100644 --- a/dl_admin/ruoyi-admin/src/main/resources/mapper/cus/CusBankMapper.xml +++ b/dl_admin/ruoyi-admin/src/main/resources/mapper/cus/CusBankMapper.xml @@ -34,4 +34,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" order by update_time desc + + + update cus_bank set del_flag = '1' where cus_id = #{cusId} + \ No newline at end of file diff --git a/dl_admin/ruoyi-admin/src/main/resources/mapper/cus/CusCompanyMapper.xml b/dl_admin/ruoyi-admin/src/main/resources/mapper/cus/CusCompanyMapper.xml index a84b43b..15aa643 100644 --- a/dl_admin/ruoyi-admin/src/main/resources/mapper/cus/CusCompanyMapper.xml +++ b/dl_admin/ruoyi-admin/src/main/resources/mapper/cus/CusCompanyMapper.xml @@ -21,6 +21,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select id, cus_id, cus_from, cus_level, busi_type, contact_address, del_flag, creator, create_time, updater, update_time from cus_company + + update cus_company set del_flag = '1' where cus_id = #{cusId} + + + update cus_contacts set del_flag = '1' where cus_id = #{cusId} + \ No newline at end of file diff --git a/dl_admin/ruoyi-admin/src/main/resources/mapper/cus/CusManagerMapper.xml b/dl_admin/ruoyi-admin/src/main/resources/mapper/cus/CusManagerMapper.xml index 5e5b91b..26a2fcc 100644 --- a/dl_admin/ruoyi-admin/src/main/resources/mapper/cus/CusManagerMapper.xml +++ b/dl_admin/ruoyi-admin/src/main/resources/mapper/cus/CusManagerMapper.xml @@ -23,6 +23,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select id, cus_id, user_id,user_name, follow_step, seas_reason, seas_group, old_dept, del_flag, creator, create_time, updater, update_time from cus_manager + + update cus_manager set del_flag = '1' where cus_id = #{cusId} + + + update cus_mark set del_flag = '1' where cus_id = #{cusId} + \ No newline at end of file diff --git a/dl_vue/src/views/cus/main/drawForm.vue b/dl_vue/src/views/cus/main/drawForm.vue index f9dcd1d..91401e0 100644 --- a/dl_vue/src/views/cus/main/drawForm.vue +++ b/dl_vue/src/views/cus/main/drawForm.vue @@ -78,12 +78,21 @@ - + + + + {{item.nowTime.substring(11,16)}}-{{item.zoneCn}}-{{item.utcOffset}} + + + {{item.nowTime.substring(11,16)}} + -{{item.zoneCn}}-{{item.utcOffset}} + + + diff --git a/dl_vue/src/views/cus/main/index.vue b/dl_vue/src/views/cus/main/index.vue index 7afce8e..bc6bab1 100644 --- a/dl_vue/src/views/cus/main/index.vue +++ b/dl_vue/src/views/cus/main/index.vue @@ -388,7 +388,7 @@ export default { }, /** 导入按钮操作 */ handleImport() { - this.upload.title = '用户导入' + this.upload.title = '客户导入' this.upload.open = true }, /** diff --git a/dl_vue/src/views/cus/main/newForm.vue b/dl_vue/src/views/cus/main/newForm.vue index 6f24d51..819efc5 100644 --- a/dl_vue/src/views/cus/main/newForm.vue +++ b/dl_vue/src/views/cus/main/newForm.vue @@ -119,12 +119,21 @@ - + + + + {{item.nowTime.substring(11,16)}}-{{item.zoneCn}}-{{item.utcOffset}} + + + {{item.nowTime.substring(11,16)}} + -{{item.zoneCn}}-{{item.utcOffset}} + + + diff --git a/dl_vue/src/views/cus/main/viewForm.vue b/dl_vue/src/views/cus/main/viewForm.vue index 06e101e..0b8fa57 100644 --- a/dl_vue/src/views/cus/main/viewForm.vue +++ b/dl_vue/src/views/cus/main/viewForm.vue @@ -26,7 +26,7 @@
- -- + {{mainInfo.cusMain.nowTime?mainInfo.cusMain.nowTime.substring(0,16):'--'}}
diff --git a/dl_vue/src/views/cus/seas/index.vue b/dl_vue/src/views/cus/seas/index.vue index a451ca0..1fa53b4 100644 --- a/dl_vue/src/views/cus/seas/index.vue +++ b/dl_vue/src/views/cus/seas/index.vue @@ -362,7 +362,7 @@ export default { }, /** 导入按钮操作 */ handleImport() { - this.upload.title = '用户导入' + this.upload.title = '客户导入' this.upload.open = true }, /** 搜索按钮操作 */