From fff15cb3b4813acbd4af5ecb5a5b0886f3373579 Mon Sep 17 00:00:00 2001 From: T-95707 Date: Fri, 24 Jul 2020 17:30:19 +0800 Subject: [PATCH 1/3] =?UTF-8?q?20200724=20zjt=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E7=BD=91=E6=8A=A5=E5=85=B6=E5=AE=83=E8=B4=B9=E7=94=A8=E6=8A=A5?= =?UTF-8?q?=E9=94=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/gitee/neuray/security/wb/ribs/biz/RibsBiz.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neuray-pm-provider/neuray-pm-provider-wb/src/main/java/com/gitee/neuray/security/wb/ribs/biz/RibsBiz.java b/neuray-pm-provider/neuray-pm-provider-wb/src/main/java/com/gitee/neuray/security/wb/ribs/biz/RibsBiz.java index d086158..f36d879 100644 --- a/neuray-pm-provider/neuray-pm-provider-wb/src/main/java/com/gitee/neuray/security/wb/ribs/biz/RibsBiz.java +++ b/neuray-pm-provider/neuray-pm-provider-wb/src/main/java/com/gitee/neuray/security/wb/ribs/biz/RibsBiz.java @@ -172,7 +172,7 @@ public class RibsBiz extends BaseBiz { qtVo.setStaffId(staffId); List qtVos = qtfyBiz.queryQt(qtVo); ret.put("data",qtVos); - ret.put("type","jtf"); + ret.put("type","qtfy"); } return ret; -- Gitee From 6e2454e93dd76578b2123f1d1f39a9bd85206619 Mon Sep 17 00:00:00 2001 From: T-95707 Date: Sun, 27 Sep 2020 13:34:47 +0800 Subject: [PATCH 2/3] =?UTF-8?q?20200927=20zjt=20=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E6=89=80=E5=B1=9E=E9=94=80=E5=94=AE=EF=BC=8C=E5=AD=98=E7=9A=84?= =?UTF-8?q?staffid?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../security/wb/ribs/biz/ApproveRoleBiz.java | 5 ++++ .../wb/ribs/controller/RibsController.java | 30 +++++++++++-------- .../wb/ribs/mapper/ApproveRoleMapper.java | 4 +++ .../neuray/security/wb/ribs/vo/RibsVo.java | 1 + .../neuray/security/wb/ribs/vo/SelectVo.java | 12 ++++++++ .../resources/mapper/ribs/ApproRoleMapper.xml | 11 +++++++ 6 files changed, 51 insertions(+), 12 deletions(-) create mode 100644 neuray-pm-provider/neuray-pm-provider-wb/src/main/java/com/gitee/neuray/security/wb/ribs/vo/SelectVo.java diff --git a/neuray-pm-provider/neuray-pm-provider-wb/src/main/java/com/gitee/neuray/security/wb/ribs/biz/ApproveRoleBiz.java b/neuray-pm-provider/neuray-pm-provider-wb/src/main/java/com/gitee/neuray/security/wb/ribs/biz/ApproveRoleBiz.java index 0444dd1..c199c4a 100644 --- a/neuray-pm-provider/neuray-pm-provider-wb/src/main/java/com/gitee/neuray/security/wb/ribs/biz/ApproveRoleBiz.java +++ b/neuray-pm-provider/neuray-pm-provider-wb/src/main/java/com/gitee/neuray/security/wb/ribs/biz/ApproveRoleBiz.java @@ -6,6 +6,7 @@ import com.gitee.neuray.security.common.util.Query; import com.gitee.neuray.security.wb.ribs.mapper.ApproveRoleMapper; import com.gitee.neuray.security.wb.ribs.vo.ApproveRoleVo; import com.gitee.neuray.security.wb.ribs.vo.RibsVo; +import com.gitee.neuray.security.wb.ribs.vo.SelectVo; import com.github.pagehelper.Page; import com.github.pagehelper.PageHelper; import org.springframework.beans.factory.annotation.Autowired; @@ -272,4 +273,8 @@ public class ApproveRoleBiz extends BaseBiz { return list; } + + public List getXS(String deptName){ + return approveRoleMapper.getXS(deptName); + } } diff --git a/neuray-pm-provider/neuray-pm-provider-wb/src/main/java/com/gitee/neuray/security/wb/ribs/controller/RibsController.java b/neuray-pm-provider/neuray-pm-provider-wb/src/main/java/com/gitee/neuray/security/wb/ribs/controller/RibsController.java index 6c327de..854d1ab 100644 --- a/neuray-pm-provider/neuray-pm-provider-wb/src/main/java/com/gitee/neuray/security/wb/ribs/controller/RibsController.java +++ b/neuray-pm-provider/neuray-pm-provider-wb/src/main/java/com/gitee/neuray/security/wb/ribs/controller/RibsController.java @@ -598,18 +598,18 @@ public class RibsController { MailServiceFeignClient client; public void testAdd() throws Exception { - SysMailSourceVo vo = new SysMailSourceVo(); - vo.setTitle("邮件标题"); - vo.setSjr("liwd@neuray.com"); - vo.setCsr("lisi@qq.com"); - vo.setAsr("wangwu@qq.com,zhaokiu@163.com"); - vo.setGnbh("123456"); - vo.setFjrbm("fjrbm"); - vo.setYjnrTe("你好 赵总 我们公司已经讨论了这个方案"); - vo.setCrtUser("userid"); - vo.setCrtName("系统管理员"); - vo.setYjsj(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date())); - client.addMail(vo); + SysMailSourceVo entity = new SysMailSourceVo(); + entity.setTitle("邮件标题"); + entity.setSjr("liwd@neuray.com"); + entity.setCsr("lisi@qq.com"); + entity.setAsr("wangwu@qq.com,zhaokiu@163.com"); + entity.setGnbh("123456"); + entity.setFjrbm("fjrbm"); + entity.setYjnrTe("你好 赵总 我们公司已经讨论了这个方案"); + entity.setCrtUser("userid"); + entity.setCrtName("系统管理员"); + entity.setYjsj(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date())); + client.addMail(entity); }*/ @RequestMapping(value = "allCount",method = RequestMethod.GET) @@ -617,4 +617,10 @@ public class RibsController { String userId = request.getHeader("userid"); return new ListRestResponse>("查询成功",3,approveRoleBiz.count(map,userId,map.get("type").toString())); } + + @RequestMapping(value = "getXS",method = RequestMethod.GET) + public ListRestResponse> getXS(@RequestParam Map params){ + List list = approveRoleBiz.getXS(params.get("deptName").toString()); + return new ListRestResponse>("查询成功",list.size(),list); + } } diff --git a/neuray-pm-provider/neuray-pm-provider-wb/src/main/java/com/gitee/neuray/security/wb/ribs/mapper/ApproveRoleMapper.java b/neuray-pm-provider/neuray-pm-provider-wb/src/main/java/com/gitee/neuray/security/wb/ribs/mapper/ApproveRoleMapper.java index 191bd88..35c490e 100644 --- a/neuray-pm-provider/neuray-pm-provider-wb/src/main/java/com/gitee/neuray/security/wb/ribs/mapper/ApproveRoleMapper.java +++ b/neuray-pm-provider/neuray-pm-provider-wb/src/main/java/com/gitee/neuray/security/wb/ribs/mapper/ApproveRoleMapper.java @@ -3,6 +3,8 @@ package com.gitee.neuray.security.wb.ribs.mapper; import com.gitee.neuray.security.common.util.Query; import com.gitee.neuray.security.wb.ribs.vo.ApproveRoleVo; import com.gitee.neuray.security.wb.ribs.vo.RibsVo; +import com.gitee.neuray.security.wb.ribs.vo.SelectVo; +import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; import tk.mybatis.mapper.common.Mapper; @@ -16,4 +18,6 @@ public interface ApproveRoleMapper extends Mapper { Integer count(Map map); + List getXS(@Param("deptName")String deptName); + } diff --git a/neuray-pm-provider/neuray-pm-provider-wb/src/main/java/com/gitee/neuray/security/wb/ribs/vo/RibsVo.java b/neuray-pm-provider/neuray-pm-provider-wb/src/main/java/com/gitee/neuray/security/wb/ribs/vo/RibsVo.java index 78e23e0..ab52ed1 100644 --- a/neuray-pm-provider/neuray-pm-provider-wb/src/main/java/com/gitee/neuray/security/wb/ribs/vo/RibsVo.java +++ b/neuray-pm-provider/neuray-pm-provider-wb/src/main/java/com/gitee/neuray/security/wb/ribs/vo/RibsVo.java @@ -67,4 +67,5 @@ public class RibsVo extends BaseEntity { private String bxyj; private String yj; + private String ssxs; } diff --git a/neuray-pm-provider/neuray-pm-provider-wb/src/main/java/com/gitee/neuray/security/wb/ribs/vo/SelectVo.java b/neuray-pm-provider/neuray-pm-provider-wb/src/main/java/com/gitee/neuray/security/wb/ribs/vo/SelectVo.java new file mode 100644 index 0000000..8866485 --- /dev/null +++ b/neuray-pm-provider/neuray-pm-provider-wb/src/main/java/com/gitee/neuray/security/wb/ribs/vo/SelectVo.java @@ -0,0 +1,12 @@ +package com.gitee.neuray.security.wb.ribs.vo; + +import com.gitee.neuray.security.common.entity.BaseEntity; +import lombok.Data; + +@Data +public class SelectVo extends BaseEntity { + + private String key; + private String title; + private String value; +} diff --git a/neuray-pm-provider/neuray-pm-provider-wb/src/main/resources/mapper/ribs/ApproRoleMapper.xml b/neuray-pm-provider/neuray-pm-provider-wb/src/main/resources/mapper/ribs/ApproRoleMapper.xml index 8340cce..f24ce23 100644 --- a/neuray-pm-provider/neuray-pm-provider-wb/src/main/resources/mapper/ribs/ApproRoleMapper.xml +++ b/neuray-pm-provider/neuray-pm-provider-wb/src/main/resources/mapper/ribs/ApproRoleMapper.xml @@ -167,4 +167,15 @@ + + -- Gitee From 0ffb36ee524d416245b003b509fa7e4cb9350f92 Mon Sep 17 00:00:00 2001 From: leewand Date: Sun, 27 Sep 2020 13:37:19 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E7=94=A8=E6=88=B7=E8=BD=AC=E6=AD=A3?= =?UTF-8?q?=E6=97=A5=E6=9C=9F=E5=8E=BB=E6=8E=89=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/StaffMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neuray-pm-provider/neuray-pm-provider-admin/src/main/resources/mapper/StaffMapper.xml b/neuray-pm-provider/neuray-pm-provider-admin/src/main/resources/mapper/StaffMapper.xml index b8989d5..80d0f5f 100644 --- a/neuray-pm-provider/neuray-pm-provider-admin/src/main/resources/mapper/StaffMapper.xml +++ b/neuray-pm-provider/neuray-pm-provider-admin/src/main/resources/mapper/StaffMapper.xml @@ -21,7 +21,7 @@ sbjnd, yglx, syq, - zzrq, + to_char(zzrq,'yyyy-mm-dd') zzrq, gwzj, sfzxm, zjhm, -- Gitee