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 b8989d5b8375fe65b3729ef559efd95250f1ca7f..80d0f5ffc03db84447a86a2da132f54a1e7e2313 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, 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 0444dd1ca2ca043fea541b9bd87c71f2b3510eb5..c199c4a62d0a8dded6025dcd743069aadc5c7d79 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/biz/RibsBiz.java b/neuray-pm-provider/neuray-pm-provider-wb/src/main/java/com/gitee/neuray/security/wb/ribs/biz/RibsBiz.java index d0861580f895a34d375eedc1b69cb8ea078b28e5..f36d879faae217942aba41d1e4b3c521e0ffb858 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; 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 6c327de48154c34c25c26e4830bd41af7a8f8141..854d1ab0a5fae9554eca491a9d5cc32f92c2a3ea 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 191bd88deccc483e360e210686ab260c0ea794b5..35c490e48b7f73928c3493befb0c6d27b230d551 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 78e23e0716de90ec28b6b1d3975ce06d88102e58..ab52ed134d749ae7cbb4b5df45fb99b81c6f2245 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 0000000000000000000000000000000000000000..886648550c7ea697bd070dc4bfb37d73be7611c4 --- /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 8340ccebfb824f60b33a59e4b6588406ea7c2e70..f24ce2336f71a2135e23b271df9299bad8177144 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 @@ + +