chenc 4 anos atrás
pai
commit
73e576eb25

+ 1 - 0
.idea/FBS_MES.iml

@@ -25,6 +25,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="Maven: com.microsoft.sqlserver:sqljdbc4:4.0" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:2.0.3.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.0.3.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.0.3.RELEASE" level="project" />

+ 5 - 1
src/main/java/org/jeecg/modules/fbsAbnormalWorkingHours/controller/FbsAbnormalWorkingHoursController.java

@@ -19,6 +19,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.extern.slf4j.Slf4j;
 
+import org.jeecg.modules.fbsPerson.entity.FbsPerson;
+import org.jeecg.modules.fbsPerson.service.IFbsPersonService;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;
@@ -45,7 +47,9 @@ import com.alibaba.fastjson.JSON;
 public class FbsAbnormalWorkingHoursController {
 	@Autowired
 	private IFbsAbnormalWorkingHoursService fbsAbnormalWorkingHoursService;
-	
+
+	@Autowired
+	private IFbsPersonService iFbsPersonService;
 	/**
 	  * 分页列表查询
 	 * @param fbsAbnormalWorkingHours

+ 20 - 6
src/main/java/org/jeecg/modules/fbsAbnormalWorkingHours/service/impl/FbsAbnormalWorkingHoursServiceImpl.java

@@ -1,5 +1,6 @@
 package org.jeecg.modules.fbsAbnormalWorkingHours.service.impl;
 
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import org.jeecg.modules.fbsAbnormalWorkingHours.entity.FbsAbnormalWorkingHours;
 import org.jeecg.modules.fbsAbnormalWorkingHours.entity.FbsAbnormalWorkingHoursDescribe;
@@ -8,6 +9,9 @@ import org.jeecg.modules.fbsAbnormalWorkingHours.mapper.FbsAbnormalWorkingHoursM
 import org.jeecg.modules.fbsAbnormalWorkingHours.service.IFbsAbnormalWorkingHoursDescribeService;
 import org.jeecg.modules.fbsAbnormalWorkingHours.service.IFbsAbnormalWorkingHoursService;
 import org.jeecg.modules.fbsAbnormalWorkingHours.service.IFbsAbnormalWorkingHoursTypeService;
+import org.jeecg.modules.fbsPerson.entity.FbsPerson;
+import org.jeecg.modules.fbsPerson.mapper.FbsPersonMapper;
+import org.jeecg.modules.fbsPerson.service.IFbsPersonService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -15,6 +19,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import java.util.List;
 
 /**
  * @Description: 生产异常信息统计单
@@ -85,16 +90,25 @@ public class FbsAbnormalWorkingHoursServiceImpl extends ServiceImpl<FbsAbnormalW
     @Override
     public boolean updateAndChild(FbsAbnormalWorkingHours fbsAbnormalWorkingHours) {
         boolean resulet=true;
-        //新增主表
-        fbsAbnormalWorkingHoursMapper.updateById(fbsAbnormalWorkingHours);
-        //物理删除子表旧数据
-        deleteChild(fbsAbnormalWorkingHours);
-        //新增子表
-        addChild(fbsAbnormalWorkingHours);
+//        //新增主表
+//        fbsAbnormalWorkingHoursMapper.updateById(fbsAbnormalWorkingHours);
+//        //物理删除子表旧数据
+//        deleteChild(fbsAbnormalWorkingHours);
+//        //新增子表
+//        addChild(fbsAbnormalWorkingHours);
 
+        pp();
         return resulet;
     }
 
+    @Autowired
+    IFbsPersonService iFbsPersonService;
+
+
+    public void pp(){
+        List<FbsPerson> fbsPersonList=iFbsPersonService.list();
+    }
+
     /**
     * @Author chenchuang
     * @Description //TODO 物理删除子表数据

+ 237 - 0
src/main/java/org/jeecg/modules/fbsPerson/controller/FbsPersonController.java

@@ -0,0 +1,237 @@
+package org.jeecg.modules.fbsPerson.controller;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.fbsPerson.entity.FbsPerson;
+import org.jeecg.modules.fbsPerson.service.IFbsPersonService;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+
+import org.jeecgframework.poi.excel.ExcelImportUtil;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.entity.ImportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.servlet.ModelAndView;
+import com.alibaba.fastjson.JSON;
+
+ /**
+ * @Title: Controller
+ * @Description: 人员档案
+ * @author: jeecg-boot
+ * @date:   2020-10-16
+ * @version: V1.0
+ */
+@RestController
+@RequestMapping("/fbsPerson/fbsPerson")
+@Slf4j
+public class FbsPersonController {
+	@Autowired
+	private IFbsPersonService fbsPersonService;
+	
+	/**
+	  * 分页列表查询
+	 * @param fbsPerson
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	@GetMapping(value = "/list")
+	public Result<IPage<FbsPerson>> queryPageList(FbsPerson fbsPerson,
+									  @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+									  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+									  HttpServletRequest req) {
+		Result<IPage<FbsPerson>> result = new Result<IPage<FbsPerson>>();
+		QueryWrapper<FbsPerson> queryWrapper = QueryGenerator.initQueryWrapper(fbsPerson, req.getParameterMap());
+		Page<FbsPerson> page = new Page<FbsPerson>(pageNo, pageSize);
+		IPage<FbsPerson> pageList = fbsPersonService.page(page, queryWrapper);
+		result.setSuccess(true);
+		result.setResult(pageList);
+		return result;
+	}
+	
+	/**
+	  *   添加
+	 * @param fbsPerson
+	 * @return
+	 */
+	@PostMapping(value = "/add")
+	public Result<FbsPerson> add(@RequestBody FbsPerson fbsPerson) {
+		Result<FbsPerson> result = new Result<FbsPerson>();
+		try {
+			fbsPersonService.save(fbsPerson);
+			result.success("添加成功!");
+		} catch (Exception e) {
+			e.printStackTrace();
+			log.info(e.getMessage());
+			result.error500("操作失败");
+		}
+		return result;
+	}
+	
+	/**
+	  *  编辑
+	 * @param fbsPerson
+	 * @return
+	 */
+	@PutMapping(value = "/edit")
+	public Result<FbsPerson> edit(@RequestBody FbsPerson fbsPerson) {
+		Result<FbsPerson> result = new Result<FbsPerson>();
+		FbsPerson fbsPersonEntity = fbsPersonService.getById(fbsPerson.getId());
+		if(fbsPersonEntity==null) {
+			result.error500("未找到对应实体");
+		}else {
+			boolean ok = fbsPersonService.updateById(fbsPerson);
+			//TODO 返回false说明什么?
+			if(ok) {
+				result.success("修改成功!");
+			}
+		}
+		
+		return result;
+	}
+	
+	/**
+	  *   通过id删除
+	 * @param id
+	 * @return
+	 */
+	@DeleteMapping(value = "/delete")
+	public Result<FbsPerson> delete(@RequestParam(name="id",required=true) String id) {
+		Result<FbsPerson> result = new Result<FbsPerson>();
+		FbsPerson fbsPerson = fbsPersonService.getById(id);
+		if(fbsPerson==null) {
+			result.error500("未找到对应实体");
+		}else {
+			boolean ok = fbsPersonService.removeById(id);
+			if(ok) {
+				result.success("删除成功!");
+			}
+		}
+		
+		return result;
+	}
+	
+	/**
+	  *  批量删除
+	 * @param ids
+	 * @return
+	 */
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<FbsPerson> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		Result<FbsPerson> result = new Result<FbsPerson>();
+		if(ids==null || "".equals(ids.trim())) {
+			result.error500("参数不识别!");
+		}else {
+			this.fbsPersonService.removeByIds(Arrays.asList(ids.split(",")));
+			result.success("删除成功!");
+		}
+		return result;
+	}
+	
+	/**
+	  * 通过id查询
+	 * @param id
+	 * @return
+	 */
+	@GetMapping(value = "/queryById")
+	public Result<FbsPerson> queryById(@RequestParam(name="id",required=true) String id) {
+		Result<FbsPerson> result = new Result<FbsPerson>();
+		FbsPerson fbsPerson = fbsPersonService.getById(id);
+		if(fbsPerson==null) {
+			result.error500("未找到对应实体");
+		}else {
+			result.setResult(fbsPerson);
+			result.setSuccess(true);
+		}
+		return result;
+	}
+
+  /**
+      * 导出excel
+   *
+   * @param request
+   * @param response
+   */
+  @RequestMapping(value = "/exportXls")
+  public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
+      // Step.1 组装查询条件
+      QueryWrapper<FbsPerson> queryWrapper = null;
+      try {
+          String paramsStr = request.getParameter("paramsStr");
+          if (oConvertUtils.isNotEmpty(paramsStr)) {
+              String deString = URLDecoder.decode(paramsStr, "UTF-8");
+              FbsPerson fbsPerson = JSON.parseObject(deString, FbsPerson.class);
+              queryWrapper = QueryGenerator.initQueryWrapper(fbsPerson, request.getParameterMap());
+          }
+      } catch (UnsupportedEncodingException e) {
+          e.printStackTrace();
+      }
+
+      //Step.2 AutoPoi 导出Excel
+      ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
+      List<FbsPerson> pageList = fbsPersonService.list(queryWrapper);
+      //导出文件名称
+      mv.addObject(NormalExcelConstants.FILE_NAME, "人员档案列表");
+      mv.addObject(NormalExcelConstants.CLASS, FbsPerson.class);
+      mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("人员档案列表数据", "导出人:Jeecg", "导出信息"));
+      mv.addObject(NormalExcelConstants.DATA_LIST, pageList);
+      return mv;
+  }
+
+  /**
+      * 通过excel导入数据
+   *
+   * @param request
+   * @param response
+   * @return
+   */
+  @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+  public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+      MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
+      Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
+      for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
+          MultipartFile file = entity.getValue();// 获取上传文件对象
+          ImportParams params = new ImportParams();
+          params.setTitleRows(2);
+          params.setHeadRows(1);
+          params.setNeedSave(true);
+          try {
+              List<FbsPerson> listFbsPersons = ExcelImportUtil.importExcel(file.getInputStream(), FbsPerson.class, params);
+              for (FbsPerson fbsPersonExcel : listFbsPersons) {
+                  fbsPersonService.save(fbsPersonExcel);
+              }
+              return Result.ok("文件导入成功!数据行数:" + listFbsPersons.size());
+          } catch (Exception e) {
+              log.error(e.getMessage());
+              return Result.error("文件导入失败!");
+          } finally {
+              try {
+                  file.getInputStream().close();
+              } catch (IOException e) {
+                  e.printStackTrace();
+              }
+          }
+      }
+      return Result.ok("文件导入失败!");
+  }
+
+}

+ 78 - 0
src/main/java/org/jeecg/modules/fbsPerson/entity/FbsPerson.java

@@ -0,0 +1,78 @@
+package org.jeecg.modules.fbsPerson.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+
+/**
+ * @Description: 人员档案
+ * @author: jeecg-boot
+ * @date:   2020-10-16
+ * @version: V1.0
+ */
+@Data
+@TableName("Person")
+public class FbsPerson implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**id*/
+	@Excel(name = "id", width = 15)
+	@TableField(exist = false)
+	private String id;
+
+	/**cpersoncode*/
+	@Excel(name = "cpersoncode", width = 15)
+	private String cpersoncode;
+	/**cpersonname*/
+	@Excel(name = "cpersonname", width = 15)
+	private String cpersonname;
+	/**cdepcode*/
+	@Excel(name = "cdepcode", width = 15)
+	private String cdepcode;
+	/**cpersonprop*/
+	@Excel(name = "cpersonprop", width = 15)
+	private String cpersonprop;
+	/**fcreditquantity*/
+	@Excel(name = "fcreditquantity", width = 15)
+	private Float fcreditquantity;
+	/**icredate*/
+	@Excel(name = "icredate", width = 15)
+	private Integer icredate;
+	/**ccregrade*/
+	@Excel(name = "ccregrade", width = 15)
+	private String ccregrade;
+	/**ilowrate*/
+	@Excel(name = "ilowrate", width = 15)
+	private Float ilowrate;
+	/**coffergrade*/
+	@Excel(name = "coffergrade", width = 15)
+	private String coffergrade;
+	/**iofferrate*/
+	@Excel(name = "iofferrate", width = 15)
+	private Float iofferrate;
+	/**pubufts*/
+	private Date pubufts;
+	/**cpersonemail*/
+	@Excel(name = "cpersonemail", width = 15)
+	private String cpersonemail;
+	/**cpersonphone*/
+	@Excel(name = "cpersonphone", width = 15)
+	private String cpersonphone;
+	/**dpvaliddate*/
+	@Excel(name = "dpvaliddate", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+	private Date dpvaliddate;
+	/**dpinvaliddate*/
+	@Excel(name = "dpinvaliddate", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+	private Date dpinvaliddate;
+}

+ 17 - 0
src/main/java/org/jeecg/modules/fbsPerson/mapper/FbsPersonMapper.java

@@ -0,0 +1,17 @@
+package org.jeecg.modules.fbsPerson.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.fbsPerson.entity.FbsPerson;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 人员档案
+ * @author: jeecg-boot
+ * @date:   2020-10-16
+ * @version: V1.0
+ */
+public interface FbsPersonMapper extends BaseMapper<FbsPerson> {
+
+}

+ 5 - 0
src/main/java/org/jeecg/modules/fbsPerson/mapper/xml/FbsPersonMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.jeecg.modules.fbsPerson.mapper.FbsPersonMapper">
+
+</mapper>

+ 14 - 0
src/main/java/org/jeecg/modules/fbsPerson/service/IFbsPersonService.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.fbsPerson.service;
+
+import org.jeecg.modules.fbsPerson.entity.FbsPerson;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: 人员档案
+ * @author: jeecg-boot
+ * @date:   2020-10-16
+ * @version: V1.0
+ */
+public interface IFbsPersonService extends IService<FbsPerson> {
+
+}

+ 21 - 0
src/main/java/org/jeecg/modules/fbsPerson/service/impl/FbsPersonServiceImpl.java

@@ -0,0 +1,21 @@
+package org.jeecg.modules.fbsPerson.service.impl;
+
+import com.baomidou.dynamic.datasource.annotation.DS;
+import org.jeecg.modules.fbsPerson.entity.FbsPerson;
+import org.jeecg.modules.fbsPerson.mapper.FbsPersonMapper;
+import org.jeecg.modules.fbsPerson.service.IFbsPersonService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 人员档案
+ * @author: jeecg-boot
+ * @date:   2020-10-16
+ * @version: V1.0
+ */
+@Service
+@DS("multi-datasource1")
+public class FbsPersonServiceImpl extends ServiceImpl<FbsPersonMapper, FbsPerson> implements IFbsPersonService {
+
+}