Skip to content

张雷 / skboot-zhongye

转到一个项目
切换导航栏
切换导航栏固定状态
336744f7 由 张雷
选项

通知记录功能修改

1 个父辈 87763050
内嵌 并排
正在显示 15 个修改的文件 包含 492 行增加 和 21 行删除
sk-module-biz/src/main/java/com/skua/modules/ajh/controller/AjhMeetingReceiptController.java
...@@ -95,8 +95,7 @@ public class AjhMeetingReceiptController { ...@@ -95,8 +95,7 @@ public class AjhMeetingReceiptController {
95 @GetMapping(value = "/get") 95 @GetMapping(value = "/get")
96 public Result<IPage<AjhMeetingReceiptVO>> getPageList(AjhMeetingReceiptVO ajhMeetingReceiptVO, 96 public Result<IPage<AjhMeetingReceiptVO>> getPageList(AjhMeetingReceiptVO ajhMeetingReceiptVO,
97 @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, 97 @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
98 @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, 98 @RequestParam(name="pageSize", defaultValue="10") Integer pageSize) {
99 HttpServletRequest req) {
100 Result<IPage<AjhMeetingReceiptVO>> result = new Result<IPage<AjhMeetingReceiptVO>>(); 99 Result<IPage<AjhMeetingReceiptVO>> result = new Result<IPage<AjhMeetingReceiptVO>>();
101 Page<AjhMeetingReceiptVO> page = new Page<AjhMeetingReceiptVO>(pageNo, pageSize); 100 Page<AjhMeetingReceiptVO> page = new Page<AjhMeetingReceiptVO>(pageNo, pageSize);
102 IPage<AjhMeetingReceiptVO> pageList = ajhMeetingReceiptService.get(page, ajhMeetingReceiptVO); 101 IPage<AjhMeetingReceiptVO> pageList = ajhMeetingReceiptService.get(page, ajhMeetingReceiptVO);
......
sk-module-biz/src/main/java/com/skua/modules/ajh/controller/AjhMeetingSendController.java
...@@ -81,14 +81,49 @@ public class AjhMeetingSendController { ...@@ -81,14 +81,49 @@ public class AjhMeetingSendController {
81 @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, 81 @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
82 HttpServletRequest req) { 82 HttpServletRequest req) {
83 Result<IPage<AjhMeetingSend>> result = new Result<IPage<AjhMeetingSend>>(); 83 Result<IPage<AjhMeetingSend>> result = new Result<IPage<AjhMeetingSend>>();
84 QueryWrapper<AjhMeetingSend> queryWrapper = QueryGenerator.initQueryWrapper(ajhMeetingSend, req.getParameterMap()); 84 QueryWrapper<AjhMeetingSend> queryWrapper = new QueryWrapper<>();
85 queryWrapper.eq(ConvertUtils.isNotEmpty(ajhMeetingSend.getDepartId()),"depart_id",ajhMeetingSend.getDepartId());
86 queryWrapper.eq(ConvertUtils.isNotEmpty(ajhMeetingSend.getMeetStatus()),"meet_status",ajhMeetingSend.getMeetStatus());
87 queryWrapper.eq(ConvertUtils.isNotEmpty(ajhMeetingSend.getSendStatus()),"send_status",ajhMeetingSend.getSendStatus());
88 queryWrapper.like(ConvertUtils.isNotEmpty(ajhMeetingSend.getMeetTitle()),"meet_title",ajhMeetingSend.getMeetTitle());
89 queryWrapper.between(ConvertUtils.isNotEmpty(ajhMeetingSend.getMeetStartTime()),"meet_start_time",
90 ajhMeetingSend.getMeetStartTime()+" 00:00:00",ajhMeetingSend.getMeetEndTime()+" 23:59:59");
85 Page<AjhMeetingSend> page = new Page<AjhMeetingSend>(pageNo, pageSize); 91 Page<AjhMeetingSend> page = new Page<AjhMeetingSend>(pageNo, pageSize);
86 IPage<AjhMeetingSend> pageList = ajhMeetingSendService.page(page, queryWrapper); 92 IPage<AjhMeetingSend> pageList = ajhMeetingSendService.queryPage(page, queryWrapper);
87 result.setSuccess(true); 93 result.setSuccess(true);
88 result.setResult(pageList); 94 result.setResult(pageList);
89 return result; 95 return result;
90 } 96 }
91 97
98 @AutoLog(value = "会议记录-数量统计")
99 @ApiOperation(value="会议记录-数量统计", notes="会议记录-数量统计")
100 @GetMapping(value = "/count")
101 public Result<Map<String,Object>> queryCount(AjhMeetingSend ajhMeetingSend) {
102 Result<Map<String,Object>> result = new Result<Map<String,Object>>();
103 QueryWrapper<AjhMeetingSend> queryWrapper = new QueryWrapper<>();
104 queryWrapper.eq(ConvertUtils.isNotEmpty(ajhMeetingSend.getDepartId()),"depart_id",ajhMeetingSend.getDepartId());
105 queryWrapper.eq(ConvertUtils.isNotEmpty(ajhMeetingSend.getMeetStatus()),"meet_status",ajhMeetingSend.getMeetStatus());
106 queryWrapper.eq(ConvertUtils.isNotEmpty(ajhMeetingSend.getSendStatus()),"send_status",ajhMeetingSend.getSendStatus());
107 queryWrapper.like(ConvertUtils.isNotEmpty(ajhMeetingSend.getMeetTitle()),"meet_title",ajhMeetingSend.getMeetTitle());
108 queryWrapper.between(ConvertUtils.isNotEmpty(ajhMeetingSend.getMeetStartTime()),"meet_start_time",
109 ajhMeetingSend.getMeetStartTime()+" 00:00:00",ajhMeetingSend.getMeetEndTime()+" 23:59:59");
110 Map<String,Object> map = new HashMap<>();
111 int yes = 0;int no = 0;
112 List<AjhMeetingSend> list = ajhMeetingSendService.list(queryWrapper);
113 for (AjhMeetingSend bean : list) {
114 if("0".equals(bean.getSendStatus())){
115 no++;
116 }else if("1".equals(bean.getSendStatus())){
117 yes++;
118 }else{}
119 }
120 map.put("yes", yes);
121 map.put("no", no);
122 result.setSuccess(true);
123 result.setResult(map);
124 return result;
125 }
126
92 /** 127 /**
93 * <pre> 128 * <pre>
94 * 添加 129 * 添加
......
sk-module-biz/src/main/java/com/skua/modules/ajh/entity/AjhMeetingSend.java
...@@ -31,7 +31,6 @@ public class AjhMeetingSend { ...@@ -31,7 +31,6 @@ public class AjhMeetingSend {
31 @ApiModelProperty(value = "主键") 31 @ApiModelProperty(value = "主键")
32 private String id; 32 private String id;
33 /**会议ID*/ 33 /**会议ID*/
34 @Excel(name = "会议ID", width = 15)
35 @ApiModelProperty(value = "会议ID") 34 @ApiModelProperty(value = "会议ID")
36 private String meetId; 35 private String meetId;
37 /**机构ID*/ 36 /**机构ID*/
...@@ -111,30 +110,33 @@ public class AjhMeetingSend { ...@@ -111,30 +110,33 @@ public class AjhMeetingSend {
111 @Dict(dicCode = "meetting_status") 110 @Dict(dicCode = "meetting_status")
112 private Integer meetStatus; 111 private Integer meetStatus;
113 /**创建人*/ 112 /**创建人*/
114 @Excel(name = "创建人", width = 15)
115 @ApiModelProperty(value = "创建人") 113 @ApiModelProperty(value = "创建人")
116 private String createBy; 114 private String createBy;
117 /**创建时间*/ 115 /**创建时间*/
118 @Excel(name = "创建时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
119 @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") 116 @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
120 @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") 117 @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
121 @ApiModelProperty(value = "创建时间") 118 @ApiModelProperty(value = "创建时间")
122 private Date createTime; 119 private Date createTime;
123 /**更新人*/ 120 /**更新人*/
124 @Excel(name = "更新人", width = 15)
125 @ApiModelProperty(value = "更新人") 121 @ApiModelProperty(value = "更新人")
126 private String updateBy; 122 private String updateBy;
127 /**更新时间*/ 123 /**更新时间*/
128 @Excel(name = "更新时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
129 @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") 124 @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
130 @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") 125 @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
131 @ApiModelProperty(value = "更新时间") 126 @ApiModelProperty(value = "更新时间")
132 private Date updateTime; 127 private Date updateTime;
133 128
134 129 /**机构名称*/
135 /**附件*/
136 @TableField(exist = false) 130 @TableField(exist = false)
137 @ApiModelProperty(value = "机构名称") 131 @ApiModelProperty(value = "机构名称")
138 private java.lang.String departName; 132 private java.lang.String departName;
133 /**邀请人数*/
134 @TableField(exist = false)
135 @ApiModelProperty(value = "邀请人数")
136 private java.lang.String inviteNum;
137 /**参与人数*/
138 @TableField(exist = false)
139 @ApiModelProperty(value = "参与人数")
140 private java.lang.String particNum;
139 141
140 } 142 }
......
sk-module-biz/src/main/java/com/skua/modules/ajh/mapper/AjhMeetingSendMapper.java
1 package com.skua.modules.ajh.mapper; 1 package com.skua.modules.ajh.mapper;
2 2
3 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
4 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
3 import com.skua.core.api.vo.LoginUser; 5 import com.skua.core.api.vo.LoginUser;
4 import com.skua.modules.ajh.entity.AjhMeetingSend; 6 import com.skua.modules.ajh.entity.AjhMeetingSend;
5 import com.baomidou.mybatisplus.core.mapper.BaseMapper; 7 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
6 import org.apache.ibatis.annotations.Param; 8 import org.apache.ibatis.annotations.Param;
9 import org.apache.ibatis.annotations.Select;
7 10
8 import java.util.List; 11 import java.util.List;
9 12
...@@ -25,8 +28,9 @@ public interface AjhMeetingSendMapper extends BaseMapper<AjhMeetingSend> { ...@@ -25,8 +28,9 @@ public interface AjhMeetingSendMapper extends BaseMapper<AjhMeetingSend> {
25 */ 28 */
26 public AjhMeetingSend queryByMeetId(@Param("meetId") String meetId); 29 public AjhMeetingSend queryByMeetId(@Param("meetId") String meetId);
27 30
28 31 @Select("SELECT *,IFNULL( r.count, 0 ) AS invite_num,IFNULL( a.count, 0 ) AS partic_num " +
29 32 " FROM ajh_meeting_send " +
30 33 " LEFT JOIN ( SELECT count( id ) count, meets_id FROM ajh_meeting_receipt GROUP BY meets_id ) r ON r.meets_id = id " +
31 34 " LEFT JOIN ( SELECT count( id ) count, meets_id FROM ajh_meeting_attend GROUP BY meets_id ) a ON a.meets_id = id ${ew.customSqlSegment}")
35 List<AjhMeetingSend> getListByWrapper(Page page,@Param("ew") QueryWrapper<AjhMeetingSend> queryWrapper);
32 } 36 }
......
sk-module-biz/src/main/java/com/skua/modules/ajh/service/IAjhMeetingSendService.java
1 package com.skua.modules.ajh.service; 1 package com.skua.modules.ajh.service;
2 2
3 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
4 import com.baomidou.mybatisplus.core.metadata.IPage;
5 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
3 import com.skua.modules.ajh.entity.AjhMeetingSend; 6 import com.skua.modules.ajh.entity.AjhMeetingSend;
4 import com.baomidou.mybatisplus.extension.service.IService; 7 import com.baomidou.mybatisplus.extension.service.IService;
5 import com.skua.modules.ajh.vo.AjhMeetingVO; 8 import com.skua.modules.ajh.vo.AjhMeetingVO;
...@@ -30,4 +33,6 @@ public interface IAjhMeetingSendService extends IService<AjhMeetingSend> { ...@@ -30,4 +33,6 @@ public interface IAjhMeetingSendService extends IService<AjhMeetingSend> {
30 * @return 33 * @return
31 */ 34 */
32 public AjhMeetingSend queryByMeetId(String meetId); 35 public AjhMeetingSend queryByMeetId(String meetId);
36
37 IPage<AjhMeetingSend> queryPage(Page<AjhMeetingSend> page, QueryWrapper<AjhMeetingSend> queryWrapper);
33 } 38 }
......
sk-module-biz/src/main/java/com/skua/modules/ajh/service/impl/AjhMeetingSendServiceImpl.java
1 package com.skua.modules.ajh.service.impl; 1 package com.skua.modules.ajh.service.impl;
2 2
3 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
4 import com.baomidou.mybatisplus.core.metadata.IPage;
5 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
3 import com.skua.core.api.vo.LoginUser; 6 import com.skua.core.api.vo.LoginUser;
4 import com.skua.modules.ajh.entity.AjhMeetingAttend; 7 import com.skua.modules.ajh.entity.AjhMeetingAttend;
5 import com.skua.modules.ajh.entity.AjhMeetingMinutes; 8 import com.skua.modules.ajh.entity.AjhMeetingMinutes;
...@@ -170,4 +173,11 @@ public class AjhMeetingSendServiceImpl extends ServiceImpl<AjhMeetingSendMapper, ...@@ -170,4 +173,11 @@ public class AjhMeetingSendServiceImpl extends ServiceImpl<AjhMeetingSendMapper,
170 public AjhMeetingSend queryByMeetId(String meetId){ 173 public AjhMeetingSend queryByMeetId(String meetId){
171 return ajhMeetingSendMapper.queryByMeetId( meetId ); 174 return ajhMeetingSendMapper.queryByMeetId( meetId );
172 } 175 }
176
177 @Override
178 public IPage<AjhMeetingSend> queryPage(Page<AjhMeetingSend> page, QueryWrapper<AjhMeetingSend> queryWrapper) {
179 List<AjhMeetingSend> list = ajhMeetingSendMapper.getListByWrapper(page, queryWrapper);
180 page.setRecords(list);
181 return page;
182 }
173 } 183 }
......
sk-module-biz/src/main/java/com/skua/modules/material/controller/MaterialInfoController.java
...@@ -66,7 +66,6 @@ public class MaterialInfoController { ...@@ -66,7 +66,6 @@ public class MaterialInfoController {
66 * @param materialInfo 66 * @param materialInfo
67 * @param pageNo 67 * @param pageNo
68 * @param pageSize 68 * @param pageSize
69 * @param req
70 * @return 69 * @return
71 */ 70 */
72 @AutoLog(value = "厂区资料管理-分页列表查询") 71 @AutoLog(value = "厂区资料管理-分页列表查询")
...@@ -74,8 +73,7 @@ public class MaterialInfoController { ...@@ -74,8 +73,7 @@ public class MaterialInfoController {
74 @GetMapping(value = "/list") 73 @GetMapping(value = "/list")
75 public Result<IPage<MaterialInfo>> queryPageList(MaterialInfo materialInfo, 74 public Result<IPage<MaterialInfo>> queryPageList(MaterialInfo materialInfo,
76 @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, 75 @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
77 @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, 76 @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
78 HttpServletRequest req) {
79 String departIds = null; 77 String departIds = null;
80 Result<IPage<MaterialInfo>> result = new Result<IPage<MaterialInfo>>(); 78 Result<IPage<MaterialInfo>> result = new Result<IPage<MaterialInfo>>();
81 Page<MaterialInfo> page = new Page<MaterialInfo>(pageNo, pageSize); 79 Page<MaterialInfo> page = new Page<MaterialInfo>(pageNo, pageSize);
......
sk-module-biz/src/main/java/com/skua/modules/material/mapper/xml/MaterialInfoMapper.xml
...@@ -68,5 +68,8 @@ ...@@ -68,5 +68,8 @@
68 <if test="materialInfo.facInformationName!=null and materialInfo.facInformationName!=''"> 68 <if test="materialInfo.facInformationName!=null and materialInfo.facInformationName!=''">
69 and fac_information_name like CONCAT(CONCAT('%', #{materialInfo.facInformationName}),'%') 69 and fac_information_name like CONCAT(CONCAT('%', #{materialInfo.facInformationName}),'%')
70 </if> 70 </if>
71 <if test="materialInfo.rulesType!=null and materialInfo.rulesType!=''">
72 and rules_type like CONCAT(CONCAT('%', #{materialInfo.rulesType}),'%')
73 </if>
71 </select> 74 </select>
72 </mapper> 75 </mapper>
......
sk-module-datafill/src/main/java/com/skua/modules/custom/mapper/xml/FCustomReportDatasetMapper.xml
...@@ -189,18 +189,27 @@ ...@@ -189,18 +189,27 @@
189 v9.CSPH as csph, 189 v9.CSPH as csph,
190 v9.CSTN as cstn, 190 v9.CSTN as cstn,
191 v9.CSZL as cstp, 191 v9.CSZL as cstp,
192 v9.JSSS as jsss,
193 v9.CSSS as csss,
192 v3.qt5,v3.qt4,v3.qt3,v3.qt2,v3.qt1, 194 v3.qt5,v3.qt4,v3.qt3,v3.qt2,v3.qt1,
193 v3.scqk5,v3.scqk4,v3.scqk3,v3.scqk2,v3.scqk1, 195 v3.scqk5,v3.scqk4,v3.scqk3,v3.scqk2,v3.scqk1,
194 v3.id,v3.zwncb,v3.tnlgyy,v3.sjtnl, 196 v3.id,v3.zwncb,v3.tnlgyy,v3.sjtnl,
195 v3.lltnl,v3.wnndgyy,v3.zsjwnnd,v3.llwnnd,v3.yjyy,v3.dhyy, 197 v3.lltnl,v3.wnndgyy,v3.zsjwnnd,v3.llwnnd,v3.yjyy,v3.dhyy,
196 v8.dlhj,v8.yjhl,v8.wnl, 198 v8.dlhj,v8.yjhl,v8.wnl,
197 v2.zclsl,v2.rjclsl 199 v2.zclsl,v2.rjclsl,
200 t.target_power as dsdhnmb,
201 round(v8.dlhj/(v2.zclsl*10000),2) as dsdhzsj,
202 '' as dsdhdb,
203 t.target_drug as yjnmb,
204 round(v8.yjhl/(v2.zclsl*10000),2) as yjzsj,
205 '' as yjdb,
206 f.pro_scale as sjgm
198 FROM 207 FROM
199 sys_depart d 208 sys_depart d
200 LEFT JOIN (SELECT * FROM view_30a8 WHERE depart_id = #{departId} AND time = #{dataTime} AND zs = #{week}) v3 on v3.depart_id = d.id 209 LEFT JOIN (SELECT * FROM view_30a8 WHERE depart_id = #{departId} AND time = #{dataTime} AND zs = #{week}) v3 on v3.depart_id = d.id
201 LEFT JOIN (SELECT 210 LEFT JOIN (SELECT
202 ROUND(AVG(JSCOD),2) JSCOD,ROUND(AVG(JSAD),2) JSAD,ROUND(AVG(JSPH),2) JSPH,ROUND(AVG(JSZD),2) JSZD,ROUND(AVG(JSZL),2) JSZL, 211 ROUND(AVG(JSCOD),2) JSCOD,ROUND(AVG(JSAD),2) JSAD,ROUND(AVG(JSPH),2) JSPH,ROUND(AVG(JSZD),2) JSZD,ROUND(AVG(JSZL),2) JSZL,ROUND(AVG(JSSS),2) JSSS,
203 ROUND(AVG(CSCOD),2) CSCOD,ROUND(AVG(CSAD),2) CSAD,ROUND(AVG(CSPH),2) CSPH,ROUND(AVG(CSTN),2) CSTN,ROUND(AVG(CSZL),2) CSZL, 212 ROUND(AVG(CSCOD),2) CSCOD,ROUND(AVG(CSAD),2) CSAD,ROUND(AVG(CSPH),2) CSPH,ROUND(AVG(CSTN),2) CSTN,ROUND(AVG(CSZL),2) CSZL,ROUND(AVG(CSSS),2) CSSS,
204 depart_id 213 depart_id
205 FROM view_9bff 214 FROM view_9bff
206 WHERE depart_id = #{departId} AND time &gt;= #{startDate} AND time &lt;= #{endDate} ) v9 on v9.depart_id = d.id 215 WHERE depart_id = #{departId} AND time &gt;= #{startDate} AND time &lt;= #{endDate} ) v9 on v9.depart_id = d.id
...@@ -216,6 +225,8 @@ ...@@ -216,6 +225,8 @@
216 depart_id 225 depart_id
217 FROM view_2119 226 FROM view_2119
218 WHERE depart_id = #{departId} AND time &gt;= #{startDate} AND time &lt;= #{endDate} ) v2 on v2.depart_id = d.id 227 WHERE depart_id = #{departId} AND time &gt;= #{startDate} AND time &lt;= #{endDate} ) v2 on v2.depart_id = d.id
228 LEFT JOIN sys_factory_info f on f.depart_id = d.id
229 LEFT JOIN report_target_config t on t.depart_id = d.id
219 WHERE 230 WHERE
220 d.id = #{departId} 231 d.id = #{departId}
221 </select> 232 </select>
......
sk-module-system/src/main/java/com/skua/modules/system/controller/SysFactoryUserDataController.java 0 → 100644
1 package com.skua.modules.system.controller;
2
3 import java.util.Arrays;
4 import java.util.List;
5 import java.util.Map;
6 import java.io.IOException;
7 import java.io.UnsupportedEncodingException;
8 import java.net.URLDecoder;
9 import javax.servlet.http.HttpServletRequest;
10 import javax.servlet.http.HttpServletResponse;
11 import com.skua.core.api.vo.Result;
12 import com.skua.core.aspect.annotation.AutoLog;
13 import com.skua.core.context.BaseContextHandler;
14 import com.skua.core.query.QueryGenerator;
15 import com.skua.core.service.ISequenceService;
16 import com.skua.core.util.ConvertUtils;
17 import com.skua.modules.system.entity.SysFactoryUserData;
18 import com.skua.modules.system.service.ISysFactoryUserDataService;
19 import java.util.Date;
20 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
21 import com.baomidou.mybatisplus.core.metadata.IPage;
22 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
23 import lombok.extern.slf4j.Slf4j;
24
25 import org.jeecgframework.poi.excel.ExcelImportUtil;
26 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
27 import org.jeecgframework.poi.excel.entity.ExportParams;
28 import org.jeecgframework.poi.excel.entity.ImportParams;
29 import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
30
31 import org.springframework.beans.factory.annotation.Autowired;
32 import org.springframework.web.bind.annotation.*;
33 import org.springframework.web.multipart.MultipartFile;
34 import org.springframework.web.multipart.MultipartHttpServletRequest;
35 import org.springframework.web.servlet.ModelAndView;
36 import com.alibaba.fastjson.JSON;
37 import io.swagger.annotations.Api;
38 import io.swagger.annotations.ApiOperation;
39
40 /**
41 * 人员证书管理
42 */
43 @Slf4j
44 @Api(tags="人员证书管理")
45 @RestController
46 @RequestMapping("/system/sysFactoryUserData")
47 public class SysFactoryUserDataController {
48 @Autowired
49 private ISysFactoryUserDataService sysFactoryUserDataService;
50
51 /**
52 * <pre>
53 * 分页列表查询
54 * </pre>
55 * @param sysFactoryUserData
56 * @param pageNo
57 * @param pageSize
58 * @param req
59 * @return
60 * @author 开发者姓名, 开发时间
61 * @Description: TODO(这里描述这个方法的需求变更情况)
62 */
63
64 @AutoLog(value = "人员证书管理-分页列表查询")
65 @ApiOperation(value="人员证书管理-分页列表查询", notes="人员证书管理-分页列表查询")
66 @GetMapping(value = "/list")
67 public Result<IPage<SysFactoryUserData>> queryPageList(SysFactoryUserData sysFactoryUserData,
68 @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
69 @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
70 HttpServletRequest req) {
71 Result<IPage<SysFactoryUserData>> result = new Result<IPage<SysFactoryUserData>>();
72 QueryWrapper<SysFactoryUserData> queryWrapper = QueryGenerator.initQueryWrapper(sysFactoryUserData, req.getParameterMap());
73 Page<SysFactoryUserData> page = new Page<SysFactoryUserData>(pageNo, pageSize);
74 IPage<SysFactoryUserData> pageList = sysFactoryUserDataService.page(page, queryWrapper);
75 result.setSuccess(true);
76 result.setResult(pageList);
77 return result;
78 }
79
80 /**
81 * <pre>
82 * 添加
83 * </pre>
84 * @param sysFactoryUserData
85 * @return
86 * @author 开发者姓名, 开发时间
87 * @Description: TODO(这里描述这个方法的需求变更情况)
88 */
89 @AutoLog(value = "人员证书管理-添加")
90 @ApiOperation(value="人员证书管理-添加", notes="人员证书管理-添加")
91 @PostMapping(value = "/add")
92 public Result<SysFactoryUserData> add(@RequestBody SysFactoryUserData sysFactoryUserData) {
93 Result<SysFactoryUserData> result = new Result<SysFactoryUserData>();
94 try {
95 sysFactoryUserDataService.save(sysFactoryUserData);
96 result.success("添加成功！");
97 } catch (Exception e) {
98 log.error(e.getMessage(),e);
99 result.error500("操作失败");
100 }
101 return result;
102 }
103 /**
104 * <pre>
105 * 编辑
106 * </pre>
107 * @param sysFactoryUserData
108 * @return
109 * @author 开发者姓名, 开发时间
110 * @Description: TODO(这里描述这个方法的需求变更情况)
111 */
112 @AutoLog(value = "人员证书管理-编辑")
113 @ApiOperation(value="人员证书管理-编辑", notes="人员证书管理-编辑")
114 @PutMapping(value = "/edit")
115 public Result<SysFactoryUserData> edit(@RequestBody SysFactoryUserData sysFactoryUserData) {
116 Result<SysFactoryUserData> result = new Result<SysFactoryUserData>();
117 SysFactoryUserData sysFactoryUserDataEntity = sysFactoryUserDataService.getById(sysFactoryUserData.getId());
118 if(sysFactoryUserDataEntity==null) {
119 result.error500("未找到对应实体");
120 }else {
121 boolean ok = sysFactoryUserDataService.updateById(sysFactoryUserData);
122 //TODO 返回false说明什么？
123 if(ok) {
124 result.success("修改成功!");
125 }
126 }
127
128 return result;
129 }
130 /**
131 * <pre>
132 * 通过id删除
133 * </pre>
134 * @param id
135 * @return
136 * @author 开发者姓名, 开发时间
137 * @Description: TODO(这里描述这个方法的需求变更情况)
138 */
139 @AutoLog(value = "人员证书管理-通过id删除")
140 @ApiOperation(value="人员证书管理-通过id删除", notes="人员证书管理-通过id删除")
141 @DeleteMapping(value = "/delete")
142 public Result<?> delete(@RequestParam(name="id",required=true) String id) {
143 try {
144 sysFactoryUserDataService.removeById(id);
145 } catch (Exception e) {
146 log.error("删除失败",e.getMessage());
147 return Result.error("删除失败!");
148 }
149 return Result.ok("删除成功!");
150 }
151
152 /**
153 * <pre>
154 * 批量删除
155 * </pre>
156 * @param ids
157 * @return
158 * @author 开发者姓名, 开发时间
159 * @Description: TODO(这里描述这个方法的需求变更情况)
160 */
161 @AutoLog(value = "人员证书管理-批量删除")
162 @ApiOperation(value="人员证书管理-批量删除", notes="人员证书管理-批量删除")
163 @DeleteMapping(value = "/deleteBatch")
164 public Result<SysFactoryUserData> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
165 Result<SysFactoryUserData> result = new Result<SysFactoryUserData>();
166 if(ids==null || "".equals(ids.trim())) {
167 result.error500("参数不识别！");
168 }else {
169 this.sysFactoryUserDataService.removeByIds(Arrays.asList(ids.split(",")));
170 result.success("删除成功!");
171 }
172 return result;
173 }
174 /**
175 * <pre>
176 * 通过id查询
177 * </pre>
178 * @param id
179 * @return
180 * @author 开发者姓名, 开发时间
181 * @Description: TODO(这里描述这个方法的需求变更情况)
182 */
183 @AutoLog(value = "人员证书管理-通过id查询")
184 @ApiOperation(value="人员证书管理-通过id查询", notes="人员证书管理-通过id查询")
185 @GetMapping(value = "/queryById")
186 public Result<SysFactoryUserData> queryById(@RequestParam(name="id",required=true) String id) {
187 Result<SysFactoryUserData> result = new Result<SysFactoryUserData>();
188 SysFactoryUserData sysFactoryUserData = sysFactoryUserDataService.getById(id);
189 if(sysFactoryUserData==null) {
190 result.error500("未找到对应实体");
191 }else {
192 result.setResult(sysFactoryUserData);
193 result.setSuccess(true);
194 }
195 return result;
196 }
197
198 /**
199 * <pre>
200 * 导出excel
201 * </pre>
202 * @param request
203 * @param response
204 * @return
205 * @author 开发者姓名, 开发时间
206 * @Description: TODO(这里描述这个方法的需求变更情况)
207 */
208
209 @RequestMapping(value = "/exportXls")
210 public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
211 // Step.1 组装查询条件
212 QueryWrapper<SysFactoryUserData> queryWrapper = null;
213 try {
214 String paramsStr = request.getParameter("paramsStr");
215 if (ConvertUtils.isNotEmpty(paramsStr)) {
216 String deString = URLDecoder.decode(paramsStr, "UTF-8");
217 SysFactoryUserData sysFactoryUserData = JSON.parseObject(deString, SysFactoryUserData.class);
218 queryWrapper = QueryGenerator.initQueryWrapper(sysFactoryUserData, request.getParameterMap());
219 }
220 } catch (UnsupportedEncodingException e) {
221 e.printStackTrace();
222 }
223
224 //Step.2 AutoPoi 导出Excel
225 ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
226 List<SysFactoryUserData> pageList = sysFactoryUserDataService.list(queryWrapper);
227 //导出文件名称
228 mv.addObject(NormalExcelConstants.FILE_NAME, "人员证书管理列表");
229 mv.addObject(NormalExcelConstants.CLASS, SysFactoryUserData.class);
230 mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("人员证书管理列表数据", "导出人:Jeecg", "导出信息"));
231 mv.addObject(NormalExcelConstants.DATA_LIST, pageList);
232 return mv;
233 }
234
235 /**
236 * <pre>
237 * 通过excel导入数据
238 * </pre>
239 * @param request
240 * @param response
241 * @return
242 * @author 开发者姓名, 开发时间
243 * @Description: TODO(这里描述这个方法的需求变更情况)
244 */
245 @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
246 public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
247 MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
248 Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
249 for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
250 MultipartFile file = entity.getValue();// 获取上传文件对象
251 ImportParams params = new ImportParams();
252 params.setTitleRows(2);
253 params.setHeadRows(1);
254 params.setNeedSave(true);
255 try {
256 List<SysFactoryUserData> listSysFactoryUserDatas = ExcelImportUtil.importExcel(file.getInputStream(), SysFactoryUserData.class, params);
257 sysFactoryUserDataService.saveBatch(listSysFactoryUserDatas);
258 return Result.ok("文件导入成功！数据行数:" + listSysFactoryUserDatas.size());
259 } catch (Exception e) {
260 log.error(e.getMessage(),e);
261 return Result.error("文件导入失败:"+e.getMessage());
262 } finally {
263 try {
264 file.getInputStream().close();
265 } catch (IOException e) {
266 e.printStackTrace();
267 }
268 }
269 }
270 return Result.ok("文件导入失败！");
271 }
272
273 }
sk-module-system/src/main/java/com/skua/modules/system/entity/SysFactoryUserData.java 0 → 100644
1 package com.skua.modules.system.entity;
2
3 import java.util.Date;
4 import com.baomidou.mybatisplus.annotation.IdType;
5 import com.baomidou.mybatisplus.annotation.TableId;
6 import com.baomidou.mybatisplus.annotation.TableName;
7 import com.skua.core.aspect.annotation.Dict;
8 import io.swagger.annotations.ApiModel;
9 import io.swagger.annotations.ApiModelProperty;
10 import lombok.Data;
11 import lombok.EqualsAndHashCode;
12 import lombok.experimental.Accessors;
13 import com.fasterxml.jackson.annotation.JsonFormat;
14 import org.springframework.format.annotation.DateTimeFormat;
15 import org.jeecgframework.poi.excel.annotation.Excel;
16
17 /**
18 * 人员证书管理
19 */
20 @Data
21 @TableName("sys_factory_user_data")
22 @EqualsAndHashCode(callSuper = false)
23 @Accessors(chain = true)
24 @ApiModel(value="sys_factory_user_data对象", description="人员证书管理")
25 public class SysFactoryUserData {
26
27 /**主键*/
28 @TableId(type = IdType.ID_WORKER_STR)
29 @ApiModelProperty(value = "主键")
30 private String id;
31 /**成员ID*/
32 @Excel(name = "成员ID", width = 15)
33 @ApiModelProperty(value = "成员ID")
34 @Dict(dicCode = "id",dictTable = "sys_user",dicText = "realname")
35 private String userId;
36 /**证件名称*/
37 @Excel(name = "证件名称", width = 15)
38 @ApiModelProperty(value = "证件名称")
39 private String certifiesName;
40 /**证件类型*/
41 @Excel(name = "证件类型", width = 15)
42 @ApiModelProperty(value = "证件类型")
43 @Dict(dicCode = "certifies_type")
44 private String certifiesType;
45 /**附件*/
46 @Excel(name = "附件", width = 15)
47 @ApiModelProperty(value = "附件")
48 private String certifiesFile;
49 /**到期时间*/
50 @Excel(name = "到期时间", width = 15)
51 @ApiModelProperty(value = "到期时间")
52 private String endTime;
53 /**备注*/
54 @Excel(name = "备注", width = 15)
55 @ApiModelProperty(value = "备注")
56 private String remark;
57 /**上传人*/
58 @Excel(name = "上传人", width = 15)
59 @ApiModelProperty(value = "上传人")
60 private String createBy;
61 /**上传时间*/
62 @Excel(name = "上传时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
63 @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
64 @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
65 @ApiModelProperty(value = "上传时间")
66 private Date createTime;
67 /**更新人*/
68 @Excel(name = "更新人", width = 15)
69 @ApiModelProperty(value = "更新人")
70 private String updateBy;
71 /**更新时间*/
72 @Excel(name = "更新时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
73 @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
74 @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
75 @ApiModelProperty(value = "更新时间")
76 private Date updateTime;
77 /**厂站ID*/
78 @Excel(name = "厂站ID", width = 15)
79 @ApiModelProperty(value = "厂站ID")
80 private String createDept;
81 /**delFlag*/
82 @Excel(name = "delFlag", width = 15)
83 @ApiModelProperty(value = "delFlag")
84 private Integer delFlag;
85 }
sk-module-system/src/main/java/com/skua/modules/system/mapper/SysFactoryUserDataMapper.java 0 → 100644
1 package com.skua.modules.system.mapper;
2
3 import java.util.List;
4
5 import org.apache.ibatis.annotations.Param;
6 import com.skua.modules.system.entity.SysFactoryUserData;
7 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
8
9 /**
10 * 人员证书管理
11 */
12 public interface SysFactoryUserDataMapper extends BaseMapper<SysFactoryUserData> {
13
14 }
sk-module-system/src/main/java/com/skua/modules/system/mapper/xml/SysFactoryUserDataMapper.xml 0 → 100644
1 <?xml version="1.0" encoding="UTF-8"?>
2 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
3 <mapper namespace="com.skua.modules.system.mapper.SysFactoryUserDataMapper">
4
5 </mapper>
...\ No newline at end of file ...\ No newline at end of file
sk-module-system/src/main/java/com/skua/modules/system/service/ISysFactoryUserDataService.java 0 → 100644
1 package com.skua.modules.system.service;
2
3 import com.skua.modules.system.entity.SysFactoryUserData;
4 import com.baomidou.mybatisplus.extension.service.IService;
5
6 /**
7 * 人员证书管理
8 */
9 public interface ISysFactoryUserDataService extends IService<SysFactoryUserData> {
10
11 }
sk-module-system/src/main/java/com/skua/modules/system/service/impl/SysFactoryUserDataServiceImpl.java 0 → 100644
1 package com.skua.modules.system.service.impl;
2
3 import com.skua.modules.system.entity.SysFactoryUserData;
4 import com.skua.modules.system.mapper.SysFactoryUserDataMapper;
5 import com.skua.modules.system.service.ISysFactoryUserDataService;
6 import org.springframework.stereotype.Service;
7
8 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
9
10 /**
11 * 人员证书管理
12 */
13 @Service
14 public class SysFactoryUserDataServiceImpl extends ServiceImpl<SysFactoryUserDataMapper, SysFactoryUserData> implements ISysFactoryUserDataService {
15
16 }
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!