From 56b277aadc10abd852ce7b013620ff7b091b03bc Mon Sep 17 00:00:00 2001 From: wangpengfei <1928057482@qq.com> Date: Mon, 17 Apr 2023 18:08:26 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=81=A2=E5=A4=8D=EF=BC=8C?= =?UTF-8?q?=E9=97=A8=E5=BA=97=E9=94=80=E5=94=AE=E6=98=8E=E7=BB=86=E6=8A=A5?= =?UTF-8?q?=E8=A1=A8=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../customer/biz/wechat/WechatRest.java | 20 +- .../supervise-portal-api/pom.xml | 6 + .../GoodsSalesReportExcelVo.java | 13 + .../StoreSalesReportExcelVo.java | 26 + .../portal/api/gdsalesreport/TotalSales.java | 14 + .../TemplateStaffConfig.java | 20 + .../TemplateStaffConfigDetailsVo.java | 20 + .../TemplateStaffConfigDto.java | 20 + .../TemplateStaffConfigFeign.java | 17 + .../TemplateStaffConfigFeignFallback.java | 11 + .../TemplateStaffConfigQuery.java | 20 + .../TemplateStaffConfigVo.java | 20 + .../api/wechattemplate/WechatTemplate.java | 31 + .../WechatTemplateDetailVo.java | 27 + .../api/wechattemplate/WechatTemplateDto.java | 35 ++ .../wechattemplate/WechatTemplateFeign.java | 18 + .../WechatTemplateFeignFallback.java | 11 + .../wechattemplate/WechatTemplateQuery.java | 27 + .../api/wechattemplate/WechatTemplateVo.java | 32 + .../portal/api/wechattemplate/content.java | 13 + .../supervise-portal-biz/pom.xml | 96 ++- .../gdsalesreport/GdSalesReportMapper.java | 15 +- .../biz/gdsalesreport/GdSalesReportMapper.xml | 47 +- .../biz/gdsalesreport/GdSalesReportRest.java | 220 ++++++- .../gdsalesreport/GdSalesReportService.java | 91 ++- .../TemplateStaffConfigMapper.java | 20 + .../TemplateStaffConfigMapper.xml | 13 + .../TemplateStaffConfigRest.java | 16 + .../TemplateStaffConfigService.java | 13 + .../wechattemplate/WechatTemplateMapper.java | 20 + .../wechattemplate/WechatTemplateMapper.xml | 13 + .../wechattemplate/WechatTemplateRest.java | 61 ++ .../wechattemplate/WechatTemplateService.java | 105 ++++ .../system/sysstaffinfo/SysStaffinfo.java | 2 + .../system/sysstaffinfo/SysStaffinfoDto.java | 29 +- .../sysstaffinfo/SysStaffinfoFeign.java | 19 +- .../SysStaffinfoFeignFallback.java | 27 +- .../sysstaffinfo/SysStaffinfoQuery.java | 8 + .../system/sysstaffinfo/SysStaffinfoVo.java | 22 + .../supervise/system/sysuser/SysUserDto.java | 8 +- .../sysstaffinfo/SysStaffinfoMapper.java | 12 + .../sysstaffinfo/SysStaffinfoMapper.xml | 181 ++++-- .../system/sysstaffinfo/SysStaffinfoRest.java | 49 +- .../sysstaffinfo/SysStaffinfoService.java | 571 +++++++++++++++--- .../system/sysuser/SysUserMapper.java | 1 + .../system/sysuser/SysUserMapper.xml | 128 ++-- .../supervise/system/sysuser/SysUserRest.java | 21 +- 47 files changed, 1883 insertions(+), 326 deletions(-) create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/gdsalesreport/GoodsSalesReportExcelVo.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/gdsalesreport/StoreSalesReportExcelVo.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/gdsalesreport/TotalSales.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/templatestaffconfig/TemplateStaffConfig.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/templatestaffconfig/TemplateStaffConfigDetailsVo.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/templatestaffconfig/TemplateStaffConfigDto.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/templatestaffconfig/TemplateStaffConfigFeign.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/templatestaffconfig/TemplateStaffConfigFeignFallback.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/templatestaffconfig/TemplateStaffConfigQuery.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/templatestaffconfig/TemplateStaffConfigVo.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/wechattemplate/WechatTemplate.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/wechattemplate/WechatTemplateDetailVo.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/wechattemplate/WechatTemplateDto.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/wechattemplate/WechatTemplateFeign.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/wechattemplate/WechatTemplateFeignFallback.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/wechattemplate/WechatTemplateQuery.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/wechattemplate/WechatTemplateVo.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/wechattemplate/content.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/templatestaffconfig/TemplateStaffConfigMapper.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/templatestaffconfig/TemplateStaffConfigMapper.xml create mode 100644 yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/templatestaffconfig/TemplateStaffConfigRest.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/templatestaffconfig/TemplateStaffConfigService.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/wechattemplate/WechatTemplateMapper.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/wechattemplate/WechatTemplateMapper.xml create mode 100644 yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/wechattemplate/WechatTemplateRest.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/wechattemplate/WechatTemplateService.java diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/wechat/WechatRest.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/wechat/WechatRest.java index 0d735f7c..27c79b73 100644 --- a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/wechat/WechatRest.java +++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/wechat/WechatRest.java @@ -44,20 +44,20 @@ public class WechatRest { return token; } - @GetMapping(value = "authGet",produces = "text/plain;charset=utf-8") + @GetMapping(value = "authGet",produces = "text/plain;charset=utf-8") public String authGet(@RequestParam(name = "signature", required = false) String signature, - @RequestParam(name = "timestamp", required = false) String timestamp, - @RequestParam(name = "nonce", required = false) String nonce, - @RequestParam(name = "echostr", required = false) String echostr) { + @RequestParam(name = "timestamp", required = false) String timestamp, + @RequestParam(name = "nonce", required = false) String nonce, + @RequestParam(name = "echostr", required = false) String echostr) { - if (StringUtils.isAnyBlank(signature, timestamp, nonce, echostr)) { - throw new IllegalArgumentException("请求参数非法，请核实!"); + if (StringUtils.isAnyBlank(signature, timestamp, nonce, echostr)) { + throw new IllegalArgumentException("请求参数非法，请核实!"); } - if (WeixinCheckoutUtil.checkSignature( signature, timestamp, nonce)) { - return echostr; + if (WeixinCheckoutUtil.checkSignature( signature, timestamp, nonce)) { + return echostr; } - return "非法请求"; - } + return "非法请求"; + } @PostMapping("/sendMessage") public void sendMessage(@RequestBody WeChatTemplateMsg data) throws Exception { diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/pom.xml b/yxt_supervise/supervise-portal/supervise-portal-api/pom.xml index 71167a06..c305cb6e 100644 --- a/yxt_supervise/supervise-portal/supervise-portal-api/pom.xml +++ b/yxt_supervise/supervise-portal/supervise-portal-api/pom.xml @@ -43,6 +43,12 @@ com.baomidou mybatis-plus-annotation + + com.alibaba + easyexcel-core + 3.2.1 + compile + diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/gdsalesreport/GoodsSalesReportExcelVo.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/gdsalesreport/GoodsSalesReportExcelVo.java new file mode 100644 index 00000000..f7bc4f1e --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/gdsalesreport/GoodsSalesReportExcelVo.java @@ -0,0 +1,13 @@ +package com.yxt.supervise.portal.api.gdsalesreport; + +import com.yxt.common.core.vo.Vo; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2023/4/17 9:07 + */ +@Data +public class GoodsSalesReportExcelVo implements Vo { + +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/gdsalesreport/StoreSalesReportExcelVo.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/gdsalesreport/StoreSalesReportExcelVo.java new file mode 100644 index 00000000..c0cd8538 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/gdsalesreport/StoreSalesReportExcelVo.java @@ -0,0 +1,26 @@ +package com.yxt.supervise.portal.api.gdsalesreport; + +import com.alibaba.excel.annotation.ExcelProperty; +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2023/4/17 9:03 + */ +@Data +public class StoreSalesReportExcelVo implements Vo { +// private String id; + @ExcelProperty(value = "渠道") + @ApiModelProperty("渠道") + private String storeName; + @ExcelProperty(value = "销售额") + @ApiModelProperty("销售额") + private String salesVolume; + //@ApiModelProperty("渠道数量") + //private String storeNum; + //private String sum; + //private String date; + +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/gdsalesreport/TotalSales.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/gdsalesreport/TotalSales.java new file mode 100644 index 00000000..b334cbaf --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/gdsalesreport/TotalSales.java @@ -0,0 +1,14 @@ +package com.yxt.supervise.portal.api.gdsalesreport; + +import lombok.Data; + +/** + * @author wangpengfei + * @date 2023/4/17 18:03 + */ +@Data +public class TotalSales { + private String sum; + private String date; + private String storeNum; +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/templatestaffconfig/TemplateStaffConfig.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/templatestaffconfig/TemplateStaffConfig.java new file mode 100644 index 00000000..6c6cec75 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/templatestaffconfig/TemplateStaffConfig.java @@ -0,0 +1,20 @@ +package com.yxt.supervise.portal.api.templatestaffconfig; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.yxt.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2023/4/10 14:34 + */ +@Data +@ApiModel(value = "模板 员工关联表", description = "模板 员工关联表") +@TableName("template_staff_config") +public class TemplateStaffConfig extends BaseEntity { + //模板sid + private String templateSid; + //员工sid + private String staffSid; +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/templatestaffconfig/TemplateStaffConfigDetailsVo.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/templatestaffconfig/TemplateStaffConfigDetailsVo.java new file mode 100644 index 00000000..c751038b --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/templatestaffconfig/TemplateStaffConfigDetailsVo.java @@ -0,0 +1,20 @@ +package com.yxt.supervise.portal.api.templatestaffconfig; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2023/4/10 14:35 + */ +@Data +@ApiModel(value = "模板 员工关联表 视图数据详情", description = "模板 员工关联表 视图数据详情") +public class TemplateStaffConfigDetailsVo implements Vo { + private String id; + //模板sid + private String templateSid; + //员工sid + private String staffSid; + private String sid; +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/templatestaffconfig/TemplateStaffConfigDto.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/templatestaffconfig/TemplateStaffConfigDto.java new file mode 100644 index 00000000..66aa431d --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/templatestaffconfig/TemplateStaffConfigDto.java @@ -0,0 +1,20 @@ +package com.yxt.supervise.portal.api.templatestaffconfig; + +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModel; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2023/4/10 14:35 + */ +@Data +@ApiModel(value = "模板 员工关联表 数据传输对象", description = "模板 员工关联表 数据传输对象") +public class TemplateStaffConfigDto implements Dto { + private String id; + //模板sid + private String templateSid; + //员工sid + private String staffSid; + private String sid; +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/templatestaffconfig/TemplateStaffConfigFeign.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/templatestaffconfig/TemplateStaffConfigFeign.java new file mode 100644 index 00000000..e241d577 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/templatestaffconfig/TemplateStaffConfigFeign.java @@ -0,0 +1,17 @@ +package com.yxt.supervise.portal.api.templatestaffconfig; + +import io.swagger.annotations.Api; +import org.springframework.cloud.openfeign.FeignClient; + +/** + * @author wangpengfei + * @date 2023/4/10 14:35 + */ +@Api(tags = "模板 员工关联表") +@FeignClient( + contextId = "yxt-supervise-TemplateStaffConfig", + name = "yxt-supervise", + path = "v1/templatestaffconfig", + fallback = TemplateStaffConfigFeignFallback.class) +public interface TemplateStaffConfigFeign { +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/templatestaffconfig/TemplateStaffConfigFeignFallback.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/templatestaffconfig/TemplateStaffConfigFeignFallback.java new file mode 100644 index 00000000..47f8b391 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/templatestaffconfig/TemplateStaffConfigFeignFallback.java @@ -0,0 +1,11 @@ +package com.yxt.supervise.portal.api.templatestaffconfig; + +import org.springframework.stereotype.Component; + +/** + * @author wangpengfei + * @date 2023/4/10 14:35 + */ +@Component +public class TemplateStaffConfigFeignFallback implements TemplateStaffConfigFeign{ +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/templatestaffconfig/TemplateStaffConfigQuery.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/templatestaffconfig/TemplateStaffConfigQuery.java new file mode 100644 index 00000000..1b4d15d3 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/templatestaffconfig/TemplateStaffConfigQuery.java @@ -0,0 +1,20 @@ +package com.yxt.supervise.portal.api.templatestaffconfig; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2023/4/10 14:35 + */ +@Data +@ApiModel(value = "模板 员工关联表 查询条件", description = "模板 员工关联表 查询条件") +public class TemplateStaffConfigQuery implements Vo { + private String id; + //模板sid + private String templateSid; + //员工sid + private String staffSid; + private String sid; +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/templatestaffconfig/TemplateStaffConfigVo.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/templatestaffconfig/TemplateStaffConfigVo.java new file mode 100644 index 00000000..0e7722d1 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/templatestaffconfig/TemplateStaffConfigVo.java @@ -0,0 +1,20 @@ +package com.yxt.supervise.portal.api.templatestaffconfig; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2023/4/10 14:35 + */ +@Data +@ApiModel(value = "模板 员工关联表 视图数据对象", description = "模板 员工关联表 视图数据对象") +public class TemplateStaffConfigVo implements Vo { + private String id; + //模板sid + private String templateSid; + //员工sid + private String staffSid; + private String sid; +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/wechattemplate/WechatTemplate.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/wechattemplate/WechatTemplate.java new file mode 100644 index 00000000..d0160fa9 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/wechattemplate/WechatTemplate.java @@ -0,0 +1,31 @@ +package com.yxt.supervise.portal.api.wechattemplate; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.yxt.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2023/4/10 11:34 + */ +@Data +@ApiModel(value = "微信消息模版", description = "微信消息模版") +@TableName("wechat_template") +public class WechatTemplate extends BaseEntity { + //id + //private String id; + //模版id + @ApiModelProperty("模版id") + private String templateId; + //标题 + @ApiModelProperty("标题") + private String title; + //格式 + @ApiModelProperty("格式") + private String json; + //行业 + @ApiModelProperty("行业") + private String trade; +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/wechattemplate/WechatTemplateDetailVo.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/wechattemplate/WechatTemplateDetailVo.java new file mode 100644 index 00000000..bbab87c0 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/wechattemplate/WechatTemplateDetailVo.java @@ -0,0 +1,27 @@ +package com.yxt.supervise.portal.api.wechattemplate; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2023/4/10 11:34 + */ +@Data +@ApiModel(value = "微信消息模版 视图数据详情", description = "微信消息模版 视图数据详情") +public class WechatTemplateDetailVo implements Vo { + private String id; + @ApiModelProperty("模版id") + private String templateId; + //标题 + @ApiModelProperty("标题") + private String title; + //格式 + @ApiModelProperty("格式") + private String json; + //行业 + @ApiModelProperty("行业") + private String trade; +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/wechattemplate/WechatTemplateDto.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/wechattemplate/WechatTemplateDto.java new file mode 100644 index 00000000..7508a091 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/wechattemplate/WechatTemplateDto.java @@ -0,0 +1,35 @@ +package com.yxt.supervise.portal.api.wechattemplate; + +import com.yxt.common.core.dto.Dto; +import com.yxt.supervise.portal.api.templatestaffconfig.TemplateStaffConfig; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * @author wangpengfei + * @date 2023/4/10 11:35 + */ +@Data +@ApiModel(value = "微信消息模版 数据传输对象", description = "微信消息模版 数据传输对象") +public class WechatTemplateDto implements Dto { + private String id; + private String sid; // sid + @ApiModelProperty("模版id") + private String templateId; + //标题 + @ApiModelProperty("标题") + private String title; + //前端传的list格式 + @ApiModelProperty("前端传的list格式,后台转json") + private List text; + //行业 + @ApiModelProperty("行业") + private String trade; + //详细内容 + @ApiModelProperty("json") + private String json; + private List templateStaffConfigs; +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/wechattemplate/WechatTemplateFeign.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/wechattemplate/WechatTemplateFeign.java new file mode 100644 index 00000000..eb229177 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/wechattemplate/WechatTemplateFeign.java @@ -0,0 +1,18 @@ +package com.yxt.supervise.portal.api.wechattemplate; + + +import io.swagger.annotations.Api; +import org.springframework.cloud.openfeign.FeignClient; + +/** + * @author wangpengfei + * @date 2023/4/10 11:35 + */ +@Api(tags = "微信模版消息") +@FeignClient( + contextId = "com.supervise-WechatTemplate", + name = "com.supervise", + path = "v1/wechattemplate", + fallback = WechatTemplateFeignFallback.class) +public interface WechatTemplateFeign { +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/wechattemplate/WechatTemplateFeignFallback.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/wechattemplate/WechatTemplateFeignFallback.java new file mode 100644 index 00000000..f1d35657 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/wechattemplate/WechatTemplateFeignFallback.java @@ -0,0 +1,11 @@ +package com.yxt.supervise.portal.api.wechattemplate; + +import org.springframework.stereotype.Component; + +/** + * @author wangpengfei + * @date 2023/4/10 11:35 + */ +@Component +public class WechatTemplateFeignFallback implements WechatTemplateFeign{ +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/wechattemplate/WechatTemplateQuery.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/wechattemplate/WechatTemplateQuery.java new file mode 100644 index 00000000..42954877 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/wechattemplate/WechatTemplateQuery.java @@ -0,0 +1,27 @@ +package com.yxt.supervise.portal.api.wechattemplate; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2023/4/10 11:35 + */ +@Data +@ApiModel(value = "微信消息模版 查询条件", description = "微信消息模版 查询条件") +public class WechatTemplateQuery implements Query { + private String id; + @ApiModelProperty("模版id") + private String templateId; + //标题 + @ApiModelProperty("标题") + private String name; + //格式 + @ApiModelProperty("格式") + private String json; + //行业 + @ApiModelProperty("行业") + private String trade; +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/wechattemplate/WechatTemplateVo.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/wechattemplate/WechatTemplateVo.java new file mode 100644 index 00000000..54c76901 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/wechattemplate/WechatTemplateVo.java @@ -0,0 +1,32 @@ +package com.yxt.supervise.portal.api.wechattemplate; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * @author wangpengfei + * @date 2023/4/10 11:35 + */ +@Data +@ApiModel(value = "微信消息模版 视图数据对象", description = "微信消息模版 视图数据对象") +public class WechatTemplateVo implements Vo { + private String id; + private String sid; + @ApiModelProperty("模版id") + private String templateId; + //标题 + @ApiModelProperty("标题") + private String title; + //格式 + @ApiModelProperty("格式") + private String json; + //行业 + @ApiModelProperty("行业") + private String trade; + + private List text; +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/wechattemplate/content.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/wechattemplate/content.java new file mode 100644 index 00000000..41ae85c6 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/wechattemplate/content.java @@ -0,0 +1,13 @@ +package com.yxt.supervise.portal.api.wechattemplate; + +import lombok.Data; + +/** + * @author wangpengfei + * @date 2023/4/10 18:23 + */ +@Data +public class content { + private String key; + private String value; +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/pom.xml b/yxt_supervise/supervise-portal/supervise-portal-biz/pom.xml index 6073feb7..92a18483 100644 --- a/yxt_supervise/supervise-portal/supervise-portal-biz/pom.xml +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/pom.xml @@ -20,25 +20,25 @@ com.yxt yxt-common-base 0.0.1 - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - + supervise-portal-api @@ -47,7 +47,7 @@ - com.alibaba.cloud + com.alibaba.cloud spring-cloud-starter-alibaba-nacos-discovery @@ -130,16 +130,54 @@ fastcsv 2.2.1 - - - - - - - - - - + + + + + + + + + + + + + commons-collections + commons-collections + 3.2.1 + + + commons-beanutils + commons-beanutils + 1.9.2 + + + commons-lang + commons-lang + 2.6 + + + commons-logging + commons-logging + 1.1.1 + + + net.sf.ezmorph + ezmorph + 1.0.6 + + + net.sf.json-lib + json-lib + 2.4 + jdk15 + + + commons-codec + commons-codec + 1.10 + + diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdsalesreport/GdSalesReportMapper.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdsalesreport/GdSalesReportMapper.java index 95f9c8ca..6e6aa976 100644 --- a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdsalesreport/GdSalesReportMapper.java +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdsalesreport/GdSalesReportMapper.java @@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.yxt.supervise.portal.api.gdsalesreport.GdSalesReport; import com.yxt.supervise.portal.api.gdsalesreport.GdSalesReportVo; +import com.yxt.supervise.portal.api.gdsalesreport.GoodsSalesReportExcelVo; +import com.yxt.supervise.portal.api.gdsalesreport.StoreSalesReportExcelVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -18,10 +20,15 @@ import java.util.List; @Mapper public interface GdSalesReportMapper extends BaseMapper { - IPage getStoreSales(IPage page, @Param(Constants.WRAPPER) Wrapper qw); - IPage getGoodsSalesReport(IPage page, @Param(Constants.WRAPPER) Wrapper qw); + List getStoreSales(@Param(Constants.WRAPPER) Wrapper qw); + List getAllStoreSalesReport(@Param(Constants.WRAPPER) Wrapper qw); - IPage getStoreSalesReportYc(IPage page, @Param(Constants.WRAPPER) Wrapper qw); + List getGoodsSalesReport(@Param(Constants.WRAPPER) Wrapper qw); + List getAllGoodsSalesReport(@Param(Constants.WRAPPER) Wrapper qw); - IPage getGoodsSalesReportYc(IPage page, @Param(Constants.WRAPPER) Wrapper qw); + List getStoreSalesReportYc(@Param(Constants.WRAPPER) Wrapper qw); + List getAllStoreSalesYcReport(@Param(Constants.WRAPPER) Wrapper qw); + + List getGoodsSalesReportYc(@Param(Constants.WRAPPER) Wrapper qw); + List getAllGoodsSalesYcReport(@Param(Constants.WRAPPER) Wrapper qw); } diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdsalesreport/GdSalesReportMapper.xml b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdsalesreport/GdSalesReportMapper.xml index a34d1d2a..96ff722f 100644 --- a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdsalesreport/GdSalesReportMapper.xml +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdsalesreport/GdSalesReportMapper.xml @@ -4,6 +4,18 @@ + + + - + + + SELECT * FROM wechat_template ${ew.sqlSegment} + + + + \ No newline at end of file diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/templatestaffconfig/TemplateStaffConfigRest.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/templatestaffconfig/TemplateStaffConfigRest.java new file mode 100644 index 00000000..2626c855 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/templatestaffconfig/TemplateStaffConfigRest.java @@ -0,0 +1,16 @@ +package com.yxt.supervise.portal.biz.templatestaffconfig; + +import com.yxt.supervise.portal.api.templatestaffconfig.TemplateStaffConfigFeign; +import io.swagger.annotations.Api; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * @author wangpengfei + * @date 2023/4/10 14:45 + */ +@Api(tags = "消息 员工关联表") +@RestController +@RequestMapping("v1/templatestaffconfig") +public class TemplateStaffConfigRest implements TemplateStaffConfigFeign { +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/templatestaffconfig/TemplateStaffConfigService.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/templatestaffconfig/TemplateStaffConfigService.java new file mode 100644 index 00000000..12b73b3a --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/templatestaffconfig/TemplateStaffConfigService.java @@ -0,0 +1,13 @@ +package com.yxt.supervise.portal.biz.templatestaffconfig; + +import com.yxt.common.base.service.MybatisBaseService; +import com.yxt.supervise.portal.api.templatestaffconfig.TemplateStaffConfig; +import org.springframework.stereotype.Service; + +/** + * @author wangpengfei + * @date 2023/4/10 14:45 + */ +@Service +public class TemplateStaffConfigService extends MybatisBaseService { +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/wechattemplate/WechatTemplateMapper.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/wechattemplate/WechatTemplateMapper.java new file mode 100644 index 00000000..5fd1b9d4 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/wechattemplate/WechatTemplateMapper.java @@ -0,0 +1,20 @@ +package com.yxt.supervise.portal.biz.wechattemplate; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.yxt.supervise.portal.api.wechattemplate.WechatTemplate; +import com.yxt.supervise.portal.api.wechattemplate.WechatTemplateVo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +/** + * @author wangpengfei + * @date 2023/4/10 10:34 + */ +@Mapper +public interface WechatTemplateMapper extends BaseMapper { + IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); + WechatTemplateVo getTemplateBySid(@Param("sid") String sid); +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/wechattemplate/WechatTemplateMapper.xml b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/wechattemplate/WechatTemplateMapper.xml new file mode 100644 index 00000000..e2a0f737 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/wechattemplate/WechatTemplateMapper.xml @@ -0,0 +1,13 @@ + + + + + + + + + \ No newline at end of file diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/wechattemplate/WechatTemplateRest.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/wechattemplate/WechatTemplateRest.java new file mode 100644 index 00000000..2248bbd5 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/wechattemplate/WechatTemplateRest.java @@ -0,0 +1,61 @@ +package com.yxt.supervise.portal.biz.wechattemplate; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.supervise.portal.api.wechattemplate.WechatTemplateDto; +import com.yxt.supervise.portal.api.wechattemplate.WechatTemplateFeign; +import com.yxt.supervise.portal.api.wechattemplate.WechatTemplateQuery; +import com.yxt.supervise.portal.api.wechattemplate.WechatTemplateVo; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +/** + * @author wangpengfei + * @date 2023/4/10 10:35 + */ +@Api(tags = "微信消息模版") +@RestController +@RequestMapping("v1/wechattemplate") +public class WechatTemplateRest implements WechatTemplateFeign { + @Autowired + WechatTemplateService wechatTemplateService; + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq){ + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = wechatTemplateService.listPageVo(pq); + return rb.success().setData(pv); + } + @ApiOperation("初始化") + @GetMapping("/getTemplateBySid/{sid}") + public ResultBean getTemplateBySid(@PathVariable("sid") String sid){ + ResultBean rb = ResultBean.fireFail(); + WechatTemplateVo pv = wechatTemplateService.getTemplateBySid(sid); + return rb.success().setData(pv); + } + @ApiOperation("新增") + @PostMapping("/save") + public ResultBean save(@RequestBody WechatTemplateDto dto){ + ResultBean rb = ResultBean.fireFail(); + wechatTemplateService.save(dto); + return rb.success().setMsg(rb.getMsg()); + } + @ApiOperation("修改") + @PostMapping("/update") + public ResultBean update(@RequestBody WechatTemplateDto dto){ + ResultBean rb = ResultBean.fireFail(); + wechatTemplateService.update(dto); + return rb.success().setMsg(rb.getMsg()); + } + @ApiOperation("删除") + @DeleteMapping("/delete/{sid}") + @ResponseBody + public ResultBean delete(@PathVariable String sid){ + ResultBean rb = ResultBean.fireFail(); + wechatTemplateService.deleteBySid(sid); + return rb.success().setMsg(rb.getMsg()); + } +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/wechattemplate/WechatTemplateService.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/wechattemplate/WechatTemplateService.java new file mode 100644 index 00000000..b6e474cc --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/wechattemplate/WechatTemplateService.java @@ -0,0 +1,105 @@ +package com.yxt.supervise.portal.biz.wechattemplate; + +import cn.hutool.core.bean.BeanUtil; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.common.base.service.MybatisBaseService; +import com.yxt.common.base.utils.PagerUtil; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.supervise.portal.api.templatestaffconfig.TemplateStaffConfig; +import com.yxt.supervise.portal.api.wechattemplate.*; +import com.yxt.supervise.portal.biz.templatestaffconfig.TemplateStaffConfigService; +import net.sf.json.JSONArray; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +/** + * @author wangpengfei + * @date 2023/4/10 10:36 + */ +@Service +public class WechatTemplateService extends MybatisBaseService { + + @Autowired + private TemplateStaffConfigService templateStaffConfigService; + + + public PagerVo listPageVo(PagerQuery pq) { + WechatTemplateQuery query = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + if (StringUtils.isNotBlank(query.getName())) { + qw.like("title", query.getName()); + } + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.selectPageVo(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + public WechatTemplateVo getTemplateBySid(String sid) { + WechatTemplateVo wechatTemplateVo=baseMapper.getTemplateBySid(sid); + String json=wechatTemplateVo.getJson(); + System.out.println(json); + wechatTemplateVo.setText(JSONObject.parseArray(json,content.class)); + return wechatTemplateVo; + } + + public ResultBean save(WechatTemplateDto dto) { + ResultBean rb = ResultBean.fireFail(); + + WechatTemplate entity=new WechatTemplate(); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + JSONArray json = JSONArray.fromObject(dto.getText()); + entity.setJson(json.toString()); + baseMapper.insert(entity); +// List entitys=new ArrayList<>(); +// if(dto.getTemplateStaffConfigs().size()>0){ +// for(TemplateStaffConfig templateStaffConfig:dto.getTemplateStaffConfigs()){ +// BeanUtil.copyProperties(dto, templateStaffConfig, "id", "sid"); +// templateStaffConfig.setTemplateSid(entity.getSid()); +// entitys.add(templateStaffConfig); +// } +// +// templateStaffConfigService.saveBatch(entitys); +// } + return rb.success().setMsg("添加模板信息成功"); + } + + public ResultBean update(WechatTemplateDto dto) { + ResultBean rb = ResultBean.fireFail(); + String dtoSid = dto.getSid(); + if (StringUtils.isBlank(dtoSid)) { + return rb.success().setMsg("添加模板信息成功"); + } + WechatTemplate entity = fetchBySid(dtoSid); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + JSONArray json = JSONArray.fromObject(dto.getText()); + entity.setJson(json.toString()); + baseMapper.updateById(entity); +// List entitys=new ArrayList<>(); +// if(dto.getTemplateStaffConfigs().size()>0){ +// templateStaffConfigService.deleteBySid(entity.getSid()); +// for(TemplateStaffConfig templateStaffConfig:dto.getTemplateStaffConfigs()){ +// BeanUtil.copyProperties(dto, templateStaffConfig, "id", "sid"); +// templateStaffConfig.setTemplateSid(entity.getSid()); +// entitys.add(templateStaffConfig); +// } +// templateStaffConfigService.saveBatch(entitys); +// } + return rb.success().setMsg("修改模板信息成功"); + } + public ResultBean deleteById(String sid) { + ResultBean rb = ResultBean.fireFail(); + int i=baseMapper.deleteById(sid); + //templateStaffConfigService.deleteBySid(sid); + return rb.success().setMsg("删除模板信息成功"); + } +} diff --git a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfo.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfo.java index 655c15ff..8a26d6f4 100644 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfo.java +++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfo.java @@ -170,4 +170,6 @@ public class SysStaffinfo extends BaseEntity { private String postRank; @ApiModelProperty("身份证地址") private String idAddrs; + @ApiModelProperty("微信") + private String openId; } diff --git a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoDto.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoDto.java index b03aef22..7ffa47bf 100644 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoDto.java +++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoDto.java @@ -32,31 +32,31 @@ public class SysStaffinfoDto implements Dto { private static final long serialVersionUID = 8637516813924395044L; @ApiModelProperty(value = "姓名", required = true) - @NotBlank(message = "姓名不能为空") + //@NotBlank(message = "姓名不能为空") private String name; @ApiModelProperty(value = "性别key", required = true) - @NotBlank(message = "性别不能为空") + //@NotBlank(message = "性别不能为空") private String genderKey; @ApiModelProperty(value = "性别", required = true) - @NotBlank(message = "性别不能为空") + //@NotBlank(message = "性别不能为空") private String gender; @ApiModelProperty(value = "员工编号") private String jobNumber; @ApiModelProperty(value = "身份证号", required = true) - @Pattern(regexp = "/(^\\d{15}$)|(^\\d{18}$)|(^\\d{17}(\\d|X|x)$)/", message = "请输入正确的身份证号") - @NotBlank(message = "身份证号不能为空") + //@Pattern(regexp = "/(^\\d{15}$)|(^\\d{18}$)|(^\\d{17}(\\d|X|x)$)/", message = "请输入正确的身份证号") + //@NotBlank(message = "身份证号不能为空") private String idNo; @ApiModelProperty(value = "证件有效期", required = true) - @NotBlank(message = "证件有效期不能为空") + //@NotBlank(message = "证件有效期不能为空") private String idTerm; @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") - @ApiModelProperty("生日") + //@ApiModelProperty("生日") private Date birthday; @ApiModelProperty(value = "民族", required = true) - @NotBlank(message = "民族不能为空") + //@NotBlank(message = "民族不能为空") private String national; @ApiModelProperty(value = "民族key", required = true) - @NotBlank(message = "民族不能为空") + //@NotBlank(message = "民族不能为空") private String nationalKey; @ApiModelProperty(value = "籍贯", required = false) private String nativePlace; @@ -75,8 +75,8 @@ public class SysStaffinfoDto implements Dto { @ApiModelProperty(value = "住址", required = false) private String address; @ApiModelProperty(value = "手机号", required = true) - @Pattern(regexp = "^((13[0-9])|(14[5,7])|(15[0-3,5-9])|(17[0,3,5-8])|(18[0-9])|(19[1,3,5-9])|166|(147))\\d{8}$", message = "手机号码格式不正确") - @NotBlank(message = "手机号不能为空") + //@Pattern(regexp = "^((13[0-9])|(14[5,7])|(15[0-3,5-9])|(17[0,3,5-8])|(18[0-9])|(19[1,3,5-9])|166|(147))\\d{8}$", message = "手机号码格式不正确") + //@NotBlank(message = "手机号不能为空") private String mobile; @ApiModelProperty(value = "邮箱", required = false) //@Pattern(regexp = "[a-zA-Z0-9]+@[a-zA-Z0-9]+\\.[a-zA-Z0-9]+", message = "邮箱格式不正确") @@ -94,10 +94,10 @@ public class SysStaffinfoDto implements Dto { @ApiModelProperty(value = "婚姻状况key", required = false) private String maritalStatusKey; @ApiModelProperty(value = "员工类型", required = true) - @NotBlank(message = "员工类型不能为空") + //@NotBlank(message = "员工类型不能为空") private String personType; @ApiModelProperty(value = "员工类型key", required = true) - @NotBlank(message = "员工类型不能为空") + //@NotBlank(message = "员工类型不能为空") private String personTypeKey; @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty("入职时间") @@ -181,5 +181,6 @@ public class SysStaffinfoDto implements Dto { private Date quitDate; @ApiModelProperty(value = "离职原因") private String quitReason; - + @ApiModelProperty(value = "微信") + private String openId; } \ No newline at end of file diff --git a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoFeign.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoFeign.java index 5f71ece3..c763452d 100644 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoFeign.java +++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoFeign.java @@ -7,6 +7,7 @@ import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import org.apache.ibatis.annotations.Delete; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.cloud.openfeign.SpringQueryMap; import org.springframework.web.bind.annotation.*; @@ -44,7 +45,12 @@ public interface SysStaffinfoFeign { @ApiOperation("员工管理分页列表") @PostMapping("/listPage") public ResultBean> listPage(@RequestBody PagerQuery pq); - + @ApiOperation("查询所有的员工") + @PostMapping("/getAllStaffinfo") + public ResultBean> getAllStaffinfo(); + @ApiOperation("员工管理分页列表 新") + @PostMapping("/listPageNew") + public ResultBean> listPageNew(@RequestBody PagerQuery pq); /** * 员工信息新增保存 * @@ -54,6 +60,9 @@ public interface SysStaffinfoFeign { @ApiOperation("新增保存") @PostMapping("/save") public ResultBean save(@Valid @RequestBody SysStaffinfoDto dto); + @ApiOperation("新增保存") + @PostMapping("/saveNew") + public ResultBean saveNew(@Valid @RequestBody SysStaffinfoDto dto); /** * 员工信息修改保存 @@ -65,7 +74,9 @@ public interface SysStaffinfoFeign { @ApiOperation("修改保存") @PostMapping("/update/{sid}") public ResultBean update(@Valid @RequestBody SysStaffinfoDto dto, @PathVariable("sid") String sid); - + @ApiOperation("修改保存") + @PostMapping("/updateNew/{sid}") + public ResultBean updateNew(@Valid @RequestBody SysStaffinfoDto dto, @PathVariable("sid") String sid); /** * 员工信息删除操作，即离职 * @@ -75,6 +86,10 @@ public interface SysStaffinfoFeign { @ApiOperation("设置离职") @PostMapping("/del") public ResultBean del(@RequestBody SysStaffQuery sysStaffQuery); + @ApiOperation("根据sid删除记录") + @DeleteMapping("/delBySid/{sid}") + @ResponseBody + public ResultBean delBySid(@PathVariable("sid")String sid); /** * 员工信息编辑初始化及详情 diff --git a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoFeignFallback.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoFeignFallback.java index b163c462..9409fa2d 100644 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoFeignFallback.java +++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoFeignFallback.java @@ -31,22 +31,47 @@ public class SysStaffinfoFeignFallback implements SysStaffinfoFeign { ResultBean rb = ResultBean.fireFail(); return rb.setMsg("接口anrui_portal/sysstaffinfo/listPage无法访问"); } - + + @Override + public ResultBean> getAllStaffinfo() { + return null; + } + + @Override + public ResultBean> listPageNew(PagerQuery pq) { + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口anrui_portal/sysstaffinfo/listPageNew无法访问"); + } @Override public ResultBean save(SysStaffinfoDto dto) { return ResultBean.fireFail().setMsg("接口anrui_portal/sysstaffinfo/save无法访问"); } + @Override + public ResultBean saveNew(SysStaffinfoDto dto) { + return null; + } + @Override public ResultBean update(SysStaffinfoDto dto, String sid) { return ResultBean.fireFail().setMsg("接口anrui_portal/sysstaffinfo/update无法访问"); } + @Override + public ResultBean updateNew(SysStaffinfoDto dto, String sid) { + return null; + } + @Override public ResultBean del(SysStaffQuery sysStaffQuery) { return null; } + @Override + public ResultBean delBySid(String sid) { + return null; + } + @Override public ResultBean fetchBySid(String sid) { diff --git a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoQuery.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoQuery.java index d494c502..76ce7058 100644 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoQuery.java +++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoQuery.java @@ -37,6 +37,14 @@ public class SysStaffinfoQuery implements Query { private String joinCompnyDateEnd; @ApiModelProperty(value = "所在部门sid") private String orgSid; + @ApiModelProperty(value = "所在部门sid") + private String orgName; @ApiModelProperty(value = "所在岗位sid") private String postSid; + @ApiModelProperty(value = "角色sid") + private String roleSid; + @ApiModelProperty(value = "角色sid") + private String roleName; + @ApiModelProperty(value = "用户名") + private String userName; } diff --git a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoVo.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoVo.java index 6b69bb32..81877bd2 100644 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoVo.java +++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoVo.java @@ -42,6 +42,28 @@ public class SysStaffinfoVo implements Vo { private String postName; @ApiModelProperty(value = "部门sid") private String orgSid; + @ApiModelProperty(value = "记录是否可用，1:可用，0:不可用") + private String isEnable; + @ApiModelProperty(value = "部门名") + private String departmentName; + @ApiModelProperty(value = "部门sid") + private String departmentSid; + @ApiModelProperty(value = "岗位sid") + private String postSid; + @ApiModelProperty(value = "岗位名称") + private String userName; + @ApiModelProperty(value = "用户sid") + private String userSid; + @ApiModelProperty(value = "角色") + private String roleName; + @ApiModelProperty(value = "类型code") + private String userType; + @ApiModelProperty(value = "用户类型:1监管、2客户、3银行") + private String userTypeKey; + @ApiModelProperty(value = "微信") + private String openId; + @ApiModelProperty(value = "职位") + private String position; } diff --git a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/SysUserDto.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/SysUserDto.java index a7ac5725..9e5de19d 100644 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/SysUserDto.java +++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/SysUserDto.java @@ -24,15 +24,15 @@ import javax.validation.constraints.NotBlank; @ApiModel(value = "用户表 数据传输对象", description = "用户表 数据传输对象") @Data public class SysUserDto implements Dto { - @ApiModelProperty("手机号") + @ApiModelProperty("手机号") private String mobile; - @ApiModelProperty("用户类型:1员工、2客户、3供应商") + @ApiModelProperty("用户类型:1员工、2客户、3供应商") private Integer userType; @ApiModelProperty(value = "姓名", required = true) - @NotBlank(message = "姓名不能为空") + //@NotBlank(message = "姓名不能为空") private String name; @ApiModelProperty(value = "验证码", required = true) - @NotBlank(message = "验证码不能为空") + //@NotBlank(message = "验证码不能为空") private String verificationCode; @ApiModelProperty(value = "部门sid") private String deptSid; diff --git a/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoMapper.java b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoMapper.java index 8bb18dc5..5766ba04 100644 --- a/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoMapper.java +++ b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoMapper.java @@ -68,6 +68,14 @@ public interface SysStaffinfoMapper extends BaseMapper { * @return */ IPage pagerList(IPage page, @Param(Constants.WRAPPER) Wrapper qw); + /** + * 员工管理分页列表 新 + * + * @param page 分页 + * @param qw 查询条件 + * @return + */ + IPage pagerListNew(IPage page, @Param(Constants.WRAPPER) Wrapper qw); /** * 根据员工sid和员工手机号码查询员工信息是否已存在 @@ -106,6 +114,8 @@ public interface SysStaffinfoMapper extends BaseMapper { int updateBySid(@Param("personType") String personType, @Param("personTypeKey") String personTypeKey, @Param("sid") String sid, @Param("date") Date date, @Param("reason") String reason); + int deleteBySid(@Param("sid") String sid); + /** * 查询当前分公司下的员工信息 * @@ -114,6 +124,8 @@ public interface SysStaffinfoMapper extends BaseMapper { */ List selectStaffList(String orgSid); + List selectAllStaffinfo(); + List> getStaffName(@Param(Constants.WRAPPER) Wrapper> qw); List> getStaffNameByDeptSid(@Param(Constants.WRAPPER) Wrapper> qw); diff --git a/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoMapper.xml b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoMapper.xml index c60ffb2b..9f2b9c2c 100644 --- a/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoMapper.xml +++ b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoMapper.xml @@ -9,21 +9,21 @@ SELECT staff.sid, staff.name, staff.mobile, staff.pinYinName, staff.firstPinYinLabel, user.headImage FROM sys_staffinfo staff LEFT JOIN sys_user user - ON staff.sid = user.staffSid + ON staff.sid = user.staffSid ORDER BY staff.firstPinYinLabel = '#', staff.firstPinYinLabel ASC, staff.pinYinName @@ -68,7 +68,7 @@ FROM sys_staff_org org INNER JOIN sys_staffinfo staff ON org.staffSid = staff.sid LEFT JOIN sys_user user - ON staff.sid = user.staffSid + ON staff.sid = user.staffSid WHERE org.orgSid = #{sid} @@ -76,7 +76,7 @@ select * from sys_staffinfo order by jobNumber desc - limit 1 + limit 1 + @@ -250,8 +306,8 @@ isHaveInsurance, case isHaveInsurance - when 1 then '是' - when 0 then '否' end as isHaveInsuranceValue, + when 1 then '是' + when 0 then '否' end as isHaveInsuranceValue, DATE_FORMAT(insuranceStartDate, '%Y-%m-%d') as insuranceStartDate, @@ -262,26 +318,26 @@ isHaveAged, case isHaveAged - when 1 then '是' - when 0 then '否' end as isHaveAgedValue, + when 1 then '是' + when 0 then '否' end as isHaveAgedValue, isHaveMedical, case isHaveMedical - when 1 then '是' - when 0 then '否' end as isHaveMedicalValue, + when 1 then '是' + when 0 then '否' end as isHaveMedicalValue, isHaveInjury, case isHaveInjury - when 1 then '是' - when 0 then '否' end as isHaveInjuryValue, + when 1 then '是' + when 0 then '否' end as isHaveInjuryValue, isHaveUnemploy, case isHaveUnemploy - when 1 then '是' - when 0 then '否' end as isHaveUnemployValue, + when 1 then '是' + when 0 then '否' end as isHaveUnemployValue, insuredPlace, @@ -306,6 +362,11 @@ quitReason = #{reason} where sid = #{sid} + + + delete from sys_staffinfo + where sid = #{sid} + + select su.sid userSid, - si.name userName, - su.headImage, - si.mobile userMobile, - sso.orgName as department, - sp.name + si.name userName, + su.headImage, + si.mobile userMobile, + sso.orgName as department, + sp.name from sys_staff_org sso - left join sys_staffinfo si on sso.staffSid = si.sid - left join sys_user su on si.sid = su.staffSid - left join sys_staff_post ssp on si.sid = ssp.staffSid - left join sys_post sp on sp.sid = ssp.postSid + left join sys_staffinfo si on sso.staffSid = si.sid + left join sys_user su on si.sid = su.staffSid + left join sys_staff_post ssp on si.sid = ssp.staffSid + left join sys_post sp on sp.sid = ssp.postSid ${ew.sqlSegment} and find_in_set(#{orgSid} - , replace (sso.orgSidPath - , '/' - , ',')) + , replace (sso.orgSidPath + , '/' + , ',')) group by su.sid @@ -357,22 +422,22 @@ diff --git a/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoRest.java b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoRest.java index d650b38f..4953a174 100644 --- a/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoRest.java +++ b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoRest.java @@ -1,8 +1,10 @@ package com.yxt.supervise.system.sysstaffinfo; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.supervise.system.sysstaffinfo.app.AppSysStaffQuery; import com.yxt.supervise.system.sysstaffinfo.app.AppSysStaffVo; +import com.yxt.supervise.system.sysuser.SysUser; import com.yxt.supervise.system.sysuser.SysUserService; import com.yxt.common.base.config.component.FileUploadComponent; import com.yxt.common.base.utils.PagerUtil; @@ -64,7 +66,19 @@ public class SysStaffinfoRest implements SysStaffinfoFeign { PagerVo pv1 = PagerUtil.pageToVo(page, pv); return rb.success().setData(pv1); } - + public ResultBean> getAllStaffinfo() { + ResultBean> rb = ResultBean.fireFail(); + List list = sysStaffinfoService.getAllStaffinfo(); + return rb.success().setData(list); + } + @Override + public ResultBean> listPageNew(@RequestBody PagerQuery pq) { + ResultBean> rb = ResultBean.fireFail(); + IPage page = sysStaffinfoService.lpagerListNew(pq); + PagerVo pv = new PagerVo<>(); + PagerVo pv1 = PagerUtil.pageToVo(page, pv); + return rb.success().setData(pv1); + } /** * 员工信息的新增保存 * @@ -80,6 +94,14 @@ public class SysStaffinfoRest implements SysStaffinfoFeign { } return rb.success().setMsg(resultBean.getMsg()); } + public ResultBean saveNew(SysStaffinfoDto dto) { + ResultBean rb = ResultBean.fireFail(); + ResultBean resultBean = sysStaffinfoService.saveStaffInfoNew(dto); + if (!resultBean.getSuccess()) { + return rb.setMsg(resultBean.getMsg()); + } + return rb.success().setMsg(resultBean.getMsg()); + } /** * 员工信息的修改保存 @@ -97,7 +119,14 @@ public class SysStaffinfoRest implements SysStaffinfoFeign { } return rb.success().setMsg(resultBean.getMsg()); } - + public ResultBean updateNew(SysStaffinfoDto dto, String sid) { + ResultBean rb = ResultBean.fireFail(); + ResultBean resultBean = sysStaffinfoService.updateStaffInfoNew(dto, sid); + if (!resultBean.getSuccess()) { + return rb.setMsg(resultBean.getMsg()); + } + return rb.success().setMsg(resultBean.getMsg()); + } /** * 进行删除操作，即设置员工类型为离职类型02的操作。 * @@ -123,6 +152,22 @@ public class SysStaffinfoRest implements SysStaffinfoFeign { return rb.success().setMsg("成功"); } + @Override + public ResultBean delBySid(String sid) { + System.out.println(sid); + ResultBean rb = ResultBean.fireFail(); + //删除员工 + int i=sysStaffinfoService.delByIds(sid); + //删除用户 + SysUser sysUser=sysUserService.getOne(new QueryWrapper().eq("staffSid",sid)); + sysUserService.delBySid(sysUser.getSid()); + if(i>0){ + return rb.success().setMsg("成功"); + }else{ + return rb.success().setMsg("失败"); + } + } + @Override public ResultBean fetchBySid(String sid) { ResultBean rb = ResultBean.fireFail(); diff --git a/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoService.java b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoService.java index e136c67a..8ab49de6 100644 --- a/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoService.java +++ b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoService.java @@ -199,7 +199,63 @@ public class SysStaffinfoService extends MybatisBaseService getAllStaffinfo() { + List sysStaffinfoVoList=baseMapper.selectAllStaffinfo(); + return sysStaffinfoVoList; + } + public IPage lpagerListNew(PagerQuery pagerQuery) { + // mybits所用的分页对对象 + IPage page = PagerUtil.queryToPage(pagerQuery); + // mybits所用的查询条件封装类 + //QueryWrapper qw = createQueryWrapper(pagerQuery.getParams()); + SysStaffinfoQuery query=pagerQuery.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + if (com.yxt.common.base.utils.StringUtils.isNotBlank(query.getName())) { + qw.like("staff.name", query.getName()); + } + if (com.yxt.common.base.utils.StringUtils.isNotBlank(query.getUserName())) { + qw.like("user.userName", query.getUserName()); + } + if (com.yxt.common.base.utils.StringUtils.isNotBlank(query.getRoleName())) { + qw.like("role.name", query.getRoleName()); + } + if (com.yxt.common.base.utils.StringUtils.isNotBlank(query.getOrgName())) { + qw.like("organ.name", query.getOrgName()); + } + if (com.yxt.common.base.utils.StringUtils.isNotBlank(query.getMobile())) { + qw.like("sta.mobile", query.getMobile()); + } +// qw.ne("staff.personTypeKey","01"); + IPage sysStaffinfoVoIPage = baseMapper.pagerListNew(page, qw); + List records = sysStaffinfoVoIPage.getRecords(); + for (SysStaffinfoVo record : records) { + String orgSid = record.getOrgSid(); + String orgName = ""; + if (StringUtils.isNotBlank(orgSid)) { + String[] split = orgSid.split(","); + for (String s : split) { + //获取本级sid获取本级部门信息 + SysOrganization sysOrganization = sysOrganizationService.fetchBySid(s); + if(sysOrganization == null){ + sysStaffOrgService.delByOrgSid(s); + }else{ + //从本级部门信息中获取上级sid + String psid = sysOrganization.getPsid(); + //从本级部门信息中获取本级部门名称 + String bjName = sysOrganization.getName(); + //获取上级sid获取上级部门信息 + SysOrganization sysOrganization1 = sysOrganizationService.fetchBySid(psid); + //从上级部门信息中获取上级部门名称 + String sjName = sysOrganization1.getName(); + orgName += sjName + "-" + bjName + ","; + } + } + orgName = orgName.substring(0, orgName.length() - 1); + record.setOrgName(orgName); + } + } + return sysStaffinfoVoIPage; + } public List selectContactsByOrgsid(String sid) { List list = baseMapper.selectContactsByOrgsid(sid); list.stream().forEach(vo -> { @@ -235,35 +291,35 @@ public class SysStaffinfoService extends MybatisBaseService sysStaffOrgVos = sysStaffOrgService.selectByStaffS(sid); + List orgList = new ArrayList<>(); + if (sysStaffOrgVos.size() > 0) { + for (SysStaffOrgVo vv : sysStaffOrgVos) { + String orgSid = sysStaffOrgService.getOrgByOrgSid(vv.getOrgSid()); + SysOrganization sysOrganization = sysOrganizationService.fetchBySid(orgSid); + if (sysOrganization != null) { + orgList.add(orgSid); + } else { + continue; + } + } + } + //根据员工sid查询员工的信息 + SysStaffinfo sysStaffinfo = fetchBySid(sid); +// if (sysStaffinfo == null) { +// return rb.setMsg("此员工信息不存在"); +// } +// //查询员工的手机号是否重复 +// SysStaffinfo sysStaffinfo2 = baseMapper.selectByMobileAndSid(dto.getMobile(), sid); +// if (sysStaffinfo2 != null) { +// return rb.setMsg("已存在手机号为" + dto.getMobile() + "的员工"); +// } +// //查询是否存在该身份证号的员工 +// SysStaffinfo sysStaffinfo3 = baseMapper.selectByIdNoAndSid(dto.getIdNo(), sid); +// if (sysStaffinfo3 != null) { +// return rb.setMsg("已存在身份证号为" + dto.getIdNo() + "的员工"); +// } + //更新用户基础信息 + BeanUtil.copyProperties(dto, sysStaffinfo); + sysStaffinfo.setJobNumber(dto.getJobNumber()); + sysStaffinfo.setPinYinName(PinYinUtils.getPinYinName(dto.getName())); + sysStaffinfo.setFirstPinYinLabel(PinYinUtils.getCharDuoPinYinChar(dto.getName())); + //是否意外险参保 +// if (dto.getIsHaveInsurance() != null) { +// //意外险参保：是 +// if (dto.getIsHaveInsurance() == 1) { +// //意外险参保地以及意外险参保开始时间和结束时间不能为空 +// if (dto.getInsuranceStartDate() == null) { +// return rb.setMsg("意外险参保时间不能为空"); +// } +// if (dto.getInsuranceEndDate() == null) { +// return rb.setMsg("意外险终止时间不能为空"); +// } +// if (StringUtils.isBlank(dto.getInsuranceAddr())) { +// return rb.setMsg("意外险参保地不能为空"); +// } +// } else { +// sysStaffinfo.setIsHaveInsurance(0); +// sysStaffinfo.setInsuranceStartDate(null); +// sysStaffinfo.setInsuranceEndDate(null); +// sysStaffinfo.setInsuranceAddr(null); +// } +// } +// if ("01".equals(dto.getPersonTypeKey())) { +// if (dto.getQuitDate() == null) { +// return rb.setMsg("离职日期不能为空"); +// } +// if (StringUtils.isBlank(dto.getQuitReason())) { +// return rb.setMsg("离职原因不能为空"); +// } +// } +// //身份证(人像面) +// if (StringUtils.isNotBlank(sysStaffinfo.getIdCardA())) { +// if (sysStaffinfo.getIdCardA().contains(fileUploadComponent.getUrlPrefix())) { +// sysStaffinfo.setIdCardA(sysStaffinfo.getIdCardA().replace(fileUploadComponent.getUrlPrefix(), "")); +// } +// } +// //身份证(国徽面) +// if (StringUtils.isNotBlank(sysStaffinfo.getIdCardB())) { +// if (sysStaffinfo.getIdCardB().contains(fileUploadComponent.getUrlPrefix())) { +// sysStaffinfo.setIdCardB(sysStaffinfo.getIdCardB().replace(fileUploadComponent.getUrlPrefix(), "")); +// } +// } +// //学历证书diploma +// if (StringUtils.isNotBlank(sysStaffinfo.getDiploma())) { +// if (sysStaffinfo.getDiploma().contains(fileUploadComponent.getUrlPrefix())) { +// sysStaffinfo.setDiploma(sysStaffinfo.getDiploma().replace(fileUploadComponent.getUrlPrefix(), "")); +// } +// } +// //学位证书degreeCertificate +// if (StringUtils.isNotBlank(sysStaffinfo.getDegreeCertificate())) { +// if (sysStaffinfo.getDegreeCertificate().contains(fileUploadComponent.getUrlPrefix())) { +// sysStaffinfo.setDegreeCertificate(sysStaffinfo.getDegreeCertificate().replace(fileUploadComponent.getUrlPrefix(), "")); +// } +// } +// //前公司离职证明leaveCertificate +// if (StringUtils.isNotBlank(sysStaffinfo.getLeaveCertificate())) { +// if (sysStaffinfo.getLeaveCertificate().contains(fileUploadComponent.getUrlPrefix())) { +// sysStaffinfo.setLeaveCertificate(sysStaffinfo.getLeaveCertificate().replace(fileUploadComponent.getUrlPrefix(), "")); +// } +// } +// //员工照片 +// if (StringUtils.isNotBlank(sysStaffinfo.getPhoto())) { +// if (sysStaffinfo.getPhoto().contains(fileUploadComponent.getUrlPrefix())) { +// sysStaffinfo.setPhoto(sysStaffinfo.getPhoto().replace(fileUploadComponent.getUrlPrefix(), "")); +// } +// } + //更新用户信息 + sysUserService.updateByStaffSid(dto.getJobNumber(), sysStaffinfo.getMobile(), sid); + //更新员工的关联的部门信息 + SysStaffOrgDto sysStaffOrgDto = dto.getSysStaffOrg(); + + int count = sysStaffOrgService.selectByStaffAndOrg(sysStaffOrgDto.getOrgSidPath(), sid, "2"); + if (count > 0) { + sysStaffOrgService.deleteByStaffSidAndType(sysStaffOrgDto.getOrgSidPath(), sid, "2"); + } + SysStaffOrg sysStaffOrg = sysStaffOrgService.getOrgByStaffSidAndPath(sid,sysStaffOrgDto.getOrgSidPath()); + if(sysStaffOrg == null){ + ResultBean staffOrgResultBean = sysStaffOrgService.selectAllByStaffSid(sid); + sysStaffOrg = staffOrgResultBean.getData(); + if(sysStaffOrg == null){ + sysStaffOrg = new SysStaffOrg(); + sysStaffOrg.setStaffSid(sid); + BeanUtil.copyProperties(sysStaffOrgDto,sysStaffOrg); + sysStaffOrg.setManageType("3"); + sysStaffOrgService.insert(sysStaffOrg); + }else{ + BeanUtil.copyProperties(sysStaffOrgDto,sysStaffOrg); + sysStaffOrg.setManageType("3"); + sysStaffOrgService.updateById(sysStaffOrg); + } + }else{ + BeanUtil.copyProperties(sysStaffOrgDto,sysStaffOrg); + sysStaffOrg.setManageType("3"); + sysStaffOrgService.updateById(sysStaffOrg); + } + + //更新员工的关联的岗位信息 +// SysStaffPostDetailsVo staffPostDetailsVo = sysStaffPostService.getPostByStaffSid(sid); +// SysStaffPost sysStaffPost = sysStaffPostService.selectByStaffSid(sid, staffPostDetailsVo.getPostSid()); +// SysStaffPostDto sysStaffPostDto = dto.getSysStaffPost(); +// sysStaffPostService.updateBySid(sysStaffPostDto, sysStaffPost.getSid()); + boolean isUpdate = updateById(sysStaffinfo); +// if (!isUpdate) { +// return rb.setMsg("更新员工信息失败"); +// } + List sysStaffOrgVos1 = sysStaffOrgService.selectByStaffS(sid); + List orgList1 = new ArrayList<>(); + if (sysStaffOrgVos1.size() > 0) { + for (SysStaffOrgVo vv : sysStaffOrgVos1) { + String orgSid = sysStaffOrgService.getOrgByOrgSid(vv.getOrgSid()); + SysOrganization sysOrganization = sysOrganizationService.fetchBySid(orgSid); + if (sysOrganization != null) { + orgList1.add(orgSid); + } else { + continue; + } + } + } + List reduce1 = orgList.stream().filter(item -> !orgList1.contains(item)).collect(toList()); +// if (reduce1.size() > 0) { +// //根据staffSid查询token +// String token = sysUserService.selectByStaffsid(sid).getToken(); +// //清空该token +// redisUtil.remove(token); +// } + return rb.success().setMsg("更新员工信息成功"); + } /** * 根据员工sid查询员工信息 * @@ -651,7 +1029,12 @@ public class SysStaffinfoService extends MybatisBaseService> selectStaffList(PcSysStaffQuery pcSysStaffQuery) { ResultBean> rb = ResultBean.fireFail(); //根据当前staffSid查询分公司sid diff --git a/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysuser/SysUserMapper.java b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysuser/SysUserMapper.java index 54ed2755..1de41e18 100644 --- a/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysuser/SysUserMapper.java +++ b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysuser/SysUserMapper.java @@ -44,6 +44,7 @@ public interface SysUserMapper extends BaseMapper { List selectListVo(); public int updatePassword(String sid, String password); + public int deleteBySid(String sid); public int updatePasswordApp(String sid, String password); diff --git a/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysuser/SysUserMapper.xml b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysuser/SysUserMapper.xml index 99bfd770..d94f7935 100644 --- a/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysuser/SysUserMapper.xml +++ b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysuser/SysUserMapper.xml @@ -5,59 +5,59 @@ @@ -271,12 +275,12 @@ select su.*, ss.name from sys_user su - left join sys_staffinfo ss on su.staffSid = ss.sid + left join sys_staffinfo ss on su.staffSid = ss.sid where su.sid in #{item} @@ -340,12 +344,12 @@