更新收付款条线

src/main/java/org/jeecg/common/dto/basedata/ArchivesCollectionLineReqDTO.java

@@ -0,0 +1,14 @@
+package org.jeecg.common.dto.basedata;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+
+@ApiModel("收付款条款请求参数")
+@Data
+public class ArchivesCollectionLineReqDTO {
+    private String id;
+
+    public ArchivesCollectionLineReqDTO() {
+    }
+}

src/main/java/org/jeecg/common/dto/prowork/ProWorkLogicListReqDTO.java

@@ -0,0 +1,47 @@
+package org.jeecg.common.dto.prowork;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.util.Date;
+
+ /**
+   * @Author jihaosen
+   * @date 2021/3/2
+   */
+
+@ApiModel(value = "日志(实施，开发，服务)列表请求参数")
+@Data
+public class ProWorkLogicListReqDTO {
+
+    @ApiModelProperty("单据编号")
+    private String billcode;
+    @ApiModelProperty("项目名称")
+    private String proName;
+    @ApiModelProperty("开始日期")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private Date startDate;
+    @ApiModelProperty("结束日期")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private Date endDate;
+    @ApiModelProperty("里程碑(计划)")
+    private String milesName;
+    @ApiModelProperty("填写人(当前用户)")
+    private String currentUser;
+    @ApiModelProperty("组织")
+     private String pkOrg;
+
+     public ProWorkLogicListReqDTO(String billcode, String proName, Date startDate, Date endDate, String milesName, String currentUser, String pkOrg) {
+         this.billcode = billcode;
+         this.proName = proName;
+         this.startDate = startDate;
+         this.endDate = endDate;
+         this.milesName = milesName;
+         this.currentUser = currentUser;
+         this.pkOrg = pkOrg;
+     }
+ }

src/main/java/org/jeecg/modules/basedata/controller/BaseArchivesCollectionLineController.java

@@ -1,82 +1,82 @@
 package org.jeecg.modules.basedata.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 io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
 import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.constant.CommonConstant;
+import org.jeecg.common.dto.basedata.ArchivesCollectionLineReqDTO;
 import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.basedata.entity.BaseArchivesCollectionLine;
 import org.jeecg.modules.basedata.service.IBaseArchivesCollectionLineService;
-
 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;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 
- /**
- * @Title: Controller
- * @Description: 收付款条线档案
- * @author： jeecg-boot
- * @date：   2021-03-02
- * @version： V1.0
- */
+/**
+   * @Author jihaosen
+   * @date 2021/3/2
+   */
+ @Api("收付款条线档案接口")
 @RestController
 @RequestMapping("/basedata/baseArchivesCollectionLine")
 @Slf4j
 public class BaseArchivesCollectionLineController {
 	@Autowired
 	private IBaseArchivesCollectionLineService baseArchivesCollectionLineService;
-	
-	/**
-	  * 分页列表查询
-	 * @param baseArchivesCollectionLine
-	 * @param pageNo
-	 * @param pageSize
-	 * @param req
-	 * @return
-	 */
+
+	 @ApiOperation(value = "分页查询", notes = "分页查询")
+	 @ApiImplicitParams({
+			 @ApiImplicitParam(name="pkOrg", value="组织",required=false, dataType="String"),
+	 })
 	@GetMapping(value = "/list")
 	public Result<IPage<BaseArchivesCollectionLine>> queryPageList(BaseArchivesCollectionLine baseArchivesCollectionLine,
-									  @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
-									  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
-									  HttpServletRequest req) {
+	  @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+	  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+	  HttpServletRequest req) {
 		Result<IPage<BaseArchivesCollectionLine>> result = new Result<IPage<BaseArchivesCollectionLine>>();
+		baseArchivesCollectionLine.setDelFlag(null);
 		QueryWrapper<BaseArchivesCollectionLine> queryWrapper = QueryGenerator.initQueryWrapper(baseArchivesCollectionLine, req.getParameterMap());
+		queryWrapper.eq("del_flag", CommonConstant.STATUS_NORMAL.toString());
+		 queryWrapper.orderByAsc("create_time");
 		Page<BaseArchivesCollectionLine> page = new Page<BaseArchivesCollectionLine>(pageNo, pageSize);
 		IPage<BaseArchivesCollectionLine> pageList = baseArchivesCollectionLineService.page(page, queryWrapper);
 		result.setSuccess(true);
 		result.setResult(pageList);
 		return result;
 	}
-	
-	/**
-	  *   添加
-	 * @param baseArchivesCollectionLine
-	 * @return
-	 */
+
+	 @ApiOperation(value = "新增接口", notes = "新增收付款条线档案")
+	 @ApiImplicitParams({
+			 @ApiImplicitParam(name="pkOrg", value="组织",required=false, dataType="String"),
+			 @ApiImplicitParam(name="code", value="编码",required=true, dataType="String"),
+			 @ApiImplicitParam(name="name", value="名称",required=true, dataType="String"),
+	 })
 	@PostMapping(value = "/add")
-	public Result<BaseArchivesCollectionLine> add(@RequestBody BaseArchivesCollectionLine baseArchivesCollectionLine) {
+	public Result<BaseArchivesCollectionLine> add(@RequestBody BaseArchivesCollectionLine baseArchivesCollectionLine,
+			BindingResult bindingResult) {
 		Result<BaseArchivesCollectionLine> result = new Result<BaseArchivesCollectionLine>();
 		try {
+			StringBuilder sb = new StringBuilder();
+			if (bindingResult.hasErrors()){
+				//记录错误信息
+				bindingResult.getAllErrors().stream().forEach(error -> sb.append(error.getDefaultMessage() + "<br/>"));
+				result.error500(sb.toString());
+				return result;
+			}
 			baseArchivesCollectionLineService.save(baseArchivesCollectionLine);
 			result.success("添加成功！");
 		} catch (Exception e) {
@@ -86,12 +86,14 @@ public class BaseArchivesCollectionLineController {
 		}
 		return result;
 	}
-	
-	/**
-	  *  编辑
-	 * @param baseArchivesCollectionLine
-	 * @return
-	 */
+
+	 @ApiOperation(value = "编辑接口", notes = "编辑收付款条线档案")
+	 @ApiImplicitParams({
+			 @ApiImplicitParam(name="id", value="id",required=false, dataType="String"),
+			 @ApiImplicitParam(name="pkOrg", value="组织",required=false, dataType="String"),
+			 @ApiImplicitParam(name="code", value="编码",required=true, dataType="String"),
+			 @ApiImplicitParam(name="name", value="名称",required=true, dataType="String"),
+	 })
 	@PutMapping(value = "/edit")
 	public Result<BaseArchivesCollectionLine> edit(@RequestBody BaseArchivesCollectionLine baseArchivesCollectionLine) {
 		Result<BaseArchivesCollectionLine> result = new Result<BaseArchivesCollectionLine>();
@@ -100,7 +102,6 @@ public class BaseArchivesCollectionLineController {
 			result.error500("未找到对应实体");
 		}else {
 			boolean ok = baseArchivesCollectionLineService.updateById(baseArchivesCollectionLine);
-			//TODO 返回false说明什么？
 			if(ok) {
 				result.success("修改成功!");
 			}
@@ -108,20 +109,23 @@ public class BaseArchivesCollectionLineController {
 		
 		return result;
 	}
-	
-	/**
-	  *   通过id删除
-	 * @param id
-	 * @return
-	 */
+
+	 @ApiOperation(value = "删除接口", notes = "删除收付款条线档案")
+	 @ApiImplicitParams({
+			 @ApiImplicitParam(name="id", value="id",required=false, dataType="String"),
+			 @ApiImplicitParam(name="pkOrg", value="组织",required=false, dataType="String"),
+			 @ApiImplicitParam(name="code", value="编码",required=true, dataType="String"),
+			 @ApiImplicitParam(name="name", value="名称",required=true, dataType="String"),
+	 })
 	@DeleteMapping(value = "/delete")
-	public Result<BaseArchivesCollectionLine> delete(@RequestParam(name="id",required=true) String id) {
+	public Result<BaseArchivesCollectionLine> delete(@RequestBody ArchivesCollectionLineReqDTO reqDTO) {
 		Result<BaseArchivesCollectionLine> result = new Result<BaseArchivesCollectionLine>();
-		BaseArchivesCollectionLine baseArchivesCollectionLine = baseArchivesCollectionLineService.getById(id);
+		BaseArchivesCollectionLine baseArchivesCollectionLine = baseArchivesCollectionLineService.getById(reqDTO.getId());
 		if(baseArchivesCollectionLine==null) {
 			result.error500("未找到对应实体");
 		}else {
-			boolean ok = baseArchivesCollectionLineService.removeById(id);
+			baseArchivesCollectionLine.setDelFlag(CommonConstant.DEL_FLAG_1.toString());
+			boolean ok = baseArchivesCollectionLineService.updateById(baseArchivesCollectionLine);
 			if(ok) {
 				result.success("删除成功!");
 			}
@@ -129,29 +133,12 @@ public class BaseArchivesCollectionLineController {
 		
 		return result;
 	}
-	
-	/**
-	  *  批量删除
-	 * @param ids
-	 * @return
-	 */
-	@DeleteMapping(value = "/deleteBatch")
-	public Result<BaseArchivesCollectionLine> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
-		Result<BaseArchivesCollectionLine> result = new Result<BaseArchivesCollectionLine>();
-		if(ids==null || "".equals(ids.trim())) {
-			result.error500("参数不识别！");
-		}else {
-			this.baseArchivesCollectionLineService.removeByIds(Arrays.asList(ids.split(",")));
-			result.success("删除成功!");
-		}
-		return result;
-	}
-	
-	/**
-	  * 通过id查询
-	 * @param id
-	 * @return
-	 */
+
+
+	 @ApiOperation(value = "通过id查询接口", notes = "通过id查询收付款条线档案")
+	 @ApiImplicitParams({
+			 @ApiImplicitParam(name="id", value="id",required=true, dataType="String"),
+	 })
 	@GetMapping(value = "/queryById")
 	public Result<BaseArchivesCollectionLine> queryById(@RequestParam(name="id",required=true) String id) {
 		Result<BaseArchivesCollectionLine> result = new Result<BaseArchivesCollectionLine>();
@@ -164,74 +151,4 @@ public class BaseArchivesCollectionLineController {
 		}
 		return result;
 	}
-
-  /**
-      * 导出excel
-   *
-   * @param request
-   * @param response
-   */
-  @RequestMapping(value = "/exportXls")
-  public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
-      // Step.1 组装查询条件
-      QueryWrapper<BaseArchivesCollectionLine> queryWrapper = null;
-      try {
-          String paramsStr = request.getParameter("paramsStr");
-          if (oConvertUtils.isNotEmpty(paramsStr)) {
-              String deString = URLDecoder.decode(paramsStr, "UTF-8");
-              BaseArchivesCollectionLine baseArchivesCollectionLine = JSON.parseObject(deString, BaseArchivesCollectionLine.class);
-              queryWrapper = QueryGenerator.initQueryWrapper(baseArchivesCollectionLine, request.getParameterMap());
-          }
-      } catch (UnsupportedEncodingException e) {
-          e.printStackTrace();
-      }
-
-      //Step.2 AutoPoi 导出Excel
-      ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
-      List<BaseArchivesCollectionLine> pageList = baseArchivesCollectionLineService.list(queryWrapper);
-      //导出文件名称
-      mv.addObject(NormalExcelConstants.FILE_NAME, "收付款条线档案列表");
-      mv.addObject(NormalExcelConstants.CLASS, BaseArchivesCollectionLine.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<BaseArchivesCollectionLine> listBaseArchivesCollectionLines = ExcelImportUtil.importExcel(file.getInputStream(), BaseArchivesCollectionLine.class, params);
-              for (BaseArchivesCollectionLine baseArchivesCollectionLineExcel : listBaseArchivesCollectionLines) {
-                  baseArchivesCollectionLineService.save(baseArchivesCollectionLineExcel);
-              }
-              return Result.ok("文件导入成功！数据行数：" + listBaseArchivesCollectionLines.size());
-          } catch (Exception e) {
-              log.error(e.getMessage());
-              return Result.error("文件导入失败！");
-          } finally {
-              try {
-                  file.getInputStream().close();
-              } catch (IOException e) {
-                  e.printStackTrace();
-              }
-          }
-      }
-      return Result.ok("文件导入失败！");
-  }
-
 }

src/main/java/org/jeecg/modules/basedata/controller/BaseArchivesCostController.java

@@ -54,6 +54,7 @@ public class BaseArchivesCostController {
 		  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 	  HttpServletRequest req) {
 		 Result<IPage<BaseArchivesCost>> result = new Result<IPage<BaseArchivesCost>>();
+		 baseArchivesCost.setDelFlag(null);
 		 QueryWrapper<BaseArchivesCost> queryWrapper = QueryGenerator.initQueryWrapper(baseArchivesCost, req.getParameterMap());
 		 Page<BaseArchivesCost> page = new Page<BaseArchivesCost>(pageNo, pageSize);
 		 queryWrapper.eq("del_flag", "0");

src/main/java/org/jeecg/modules/basedata/entity/BaseArchivesCollectionLine.java

@@ -5,51 +5,50 @@ import java.util.Date;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.springframework.format.annotation.DateTimeFormat;
-import org.jeecgframework.poi.excel.annotation.Excel;
+
+import javax.validation.constraints.NotEmpty;
 
 /**
- * @Description: 收付款条线档案
- * @author： jeecg-boot
- * @date：   2021-03-02
- * @version： V1.0
- */
+   * @Author jihaosen
+   * @date 2021/3/2
+   */
+
+@ApiModel("收付款条线档案")
 @Data
 @TableName("base_archives_collection_line")
 public class BaseArchivesCollectionLine implements Serializable {
     private static final long serialVersionUID = 1L;
-    
-	/**id*/
+    @ApiModelProperty("id")
 	@TableId(type = IdType.UUID)
-	private java.lang.String id;
-	/**编码*/
-	@Excel(name = "编码", width = 15)
-	private java.lang.String code;
-	/**名称*/
-	@Excel(name = "名称", width = 15)
-	private java.lang.String name;
-	/**创建时间*/
-	@Excel(name = "创建时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+	private String id;
+	@ApiModelProperty("编码")
+	@NotEmpty(message = "参数code不为空")
+	private String code;
+	@ApiModelProperty("名称")
+	@NotEmpty(message = "参数name不为空")
+	private String name;
+	@ApiModelProperty("创建时间")
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-	private java.util.Date createTime;
-	/**创建人*/
-	@Excel(name = "创建人", width = 15)
-	private java.lang.String createBy;
-	/**修改时间*/
-	@Excel(name = "修改时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+	private Date createTime;
+	@ApiModelProperty("创建人")
+	private String createBy;
+	@ApiModelProperty("修改时间")
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-	private java.util.Date updateTime;
-	/**修改人*/
-	@Excel(name = "修改人", width = 15)
-	private java.lang.String updateBy;
-	/**删除状态（0，正常，1已删除）*/
-	@Excel(name = "删除状态（0，正常，1已删除）", width = 15)
-	private java.lang.String delFlag;
-	/**组织*/
-	@Excel(name = "组织", width = 15)
-	private java.lang.String pkOrg;
+	private Date updateTime;
+	@ApiModelProperty("修改人")
+	private String updateBy;
+	@ApiModelProperty("删除状态（0，正常，1已删除）")
+	private String delFlag;
+	@ApiModelProperty("组织")
+	private String pkOrg;
+
+	public BaseArchivesCollectionLine() {
+	}
 }

src/main/java/org/jeecg/modules/prowork/controller/ProWorkLogicController.java

@@ -0,0 +1,254 @@
+package org.jeecg.modules.prowork.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 io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang.StringUtils;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.constant.CommonConstant;
+import org.jeecg.common.dto.prowork.ProWorkLogicListReqDTO;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.prowork.entity.ProWorkLogic;
+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.jeecg.modules.prowork.service.ProWorkLogicService;
+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.validation.BindingResult;
+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：   2021-03-02
+ * @version： V1.0
+ */
+@RestController
+@RequestMapping("/prowork/proWorkLogic")
+@Slf4j
+public class ProWorkLogicController {
+	@Autowired
+	private ProWorkLogicService proWorkLogicService;
+
+
+	 @ApiOperation(value = "分页查询接口", notes = "日志分页查询")
+	 @ApiImplicitParams({
+			 @ApiImplicitParam(name="pkOrg", value="组织",required=false, dataType="String"),
+	 })
+	@GetMapping(value = "/list")
+	public Result<IPage<ProWorkLogic>> queryPageList(ProWorkLogicListReqDTO reqDTO,
+	 @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+	 @RequestParam(name="pageSize", defaultValue="10") Integer pageSize
+	 ) {
+		Result<IPage<ProWorkLogic>> result = new Result<IPage<ProWorkLogic>>();
+		QueryWrapper<ProWorkLogic> queryWrapper = new QueryWrapper<>();
+		Page<ProWorkLogic> page = new Page<ProWorkLogic>(pageNo, pageSize);
+
+		if(StringUtils.isNotBlank(reqDTO.getBillcode())){
+			queryWrapper.eq("billcode", reqDTO.getBillcode());
+		}
+//		if(StringUtils.isNotBlank(reqDTO.get))
+
+		queryWrapper.eq("pkOrg", reqDTO.getPkOrg());
+		queryWrapper.eq("del_flag", CommonConstant.STATUS_NORMAL.toString());
+		IPage<ProWorkLogic> pageList = proWorkLogicService.page(page, queryWrapper);
+		result.setSuccess(true);
+		result.setResult(pageList);
+		return result;
+	}
+	
+	/**
+	  *   添加
+	 * @param proWorkLogic
+	 * @return
+	 */
+	@PostMapping(value = "/add")
+	public Result<ProWorkLogic> add(@RequestBody ProWorkLogic proWorkLogic, BindingResult bindingResult) {
+		Result<ProWorkLogic> result = new Result<ProWorkLogic>();
+		try {
+			StringBuilder sb = new StringBuilder();
+			if (bindingResult.hasErrors()){
+				//记录错误信息
+				bindingResult.getAllErrors().stream().forEach(error -> sb.append(error.getDefaultMessage() + "<br/>"));
+				result.error500(sb.toString());
+				return result;
+			}
+			proWorkLogicService.save(proWorkLogic);
+			result.success("添加成功！");
+		} catch (Exception e) {
+			e.printStackTrace();
+			log.info(e.getMessage());
+			result.error500("操作失败");
+		}
+		return result;
+	}
+	
+	/**
+	  *  编辑
+	 * @param proWorkLogic
+	 * @return
+	 */
+	@PutMapping(value = "/edit")
+	public Result<ProWorkLogic> edit(@RequestBody ProWorkLogic proWorkLogic) {
+		Result<ProWorkLogic> result = new Result<ProWorkLogic>();
+		ProWorkLogic proWorkLogicEntity = proWorkLogicService.getById(proWorkLogic.getId());
+		if(proWorkLogicEntity==null) {
+			result.error500("未找到对应实体");
+		}else {
+			boolean ok = proWorkLogicService.updateById(proWorkLogic);
+			//TODO 返回false说明什么？
+			if(ok) {
+				result.success("修改成功!");
+			}
+		}
+		
+		return result;
+	}
+	
+	/**
+	  *   通过id删除
+	 * @param id
+	 * @return
+	 */
+	@DeleteMapping(value = "/delete")
+	public Result<ProWorkLogic> delete(@RequestParam(name="id",required=true) String id) {
+		Result<ProWorkLogic> result = new Result<ProWorkLogic>();
+		ProWorkLogic proWorkLogic = proWorkLogicService.getById(id);
+		if(proWorkLogic==null) {
+			result.error500("未找到对应实体");
+		}else {
+			boolean ok = proWorkLogicService.removeById(id);
+			if(ok) {
+				result.success("删除成功!");
+			}
+		}
+		
+		return result;
+	}
+	
+	/**
+	  *  批量删除
+	 * @param ids
+	 * @return
+	 */
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<ProWorkLogic> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		Result<ProWorkLogic> result = new Result<ProWorkLogic>();
+		if(ids==null || "".equals(ids.trim())) {
+			result.error500("参数不识别！");
+		}else {
+			this.proWorkLogicService.removeByIds(Arrays.asList(ids.split(",")));
+			result.success("删除成功!");
+		}
+		return result;
+	}
+	
+	/**
+	  * 通过id查询
+	 * @param id
+	 * @return
+	 */
+	@GetMapping(value = "/queryById")
+	public Result<ProWorkLogic> queryById(@RequestParam(name="id",required=true) String id) {
+		Result<ProWorkLogic> result = new Result<ProWorkLogic>();
+		ProWorkLogic proWorkLogic = proWorkLogicService.getById(id);
+		if(proWorkLogic==null) {
+			result.error500("未找到对应实体");
+		}else {
+			result.setResult(proWorkLogic);
+			result.setSuccess(true);
+		}
+		return result;
+	}
+
+  /**
+      * 导出excel
+   *
+   * @param request
+   * @param response
+   */
+  @RequestMapping(value = "/exportXls")
+  public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
+      // Step.1 组装查询条件
+      QueryWrapper<ProWorkLogic> queryWrapper = null;
+      try {
+          String paramsStr = request.getParameter("paramsStr");
+          if (oConvertUtils.isNotEmpty(paramsStr)) {
+              String deString = URLDecoder.decode(paramsStr, "UTF-8");
+              ProWorkLogic proWorkLogic = JSON.parseObject(deString, ProWorkLogic.class);
+              queryWrapper = QueryGenerator.initQueryWrapper(proWorkLogic, request.getParameterMap());
+          }
+      } catch (UnsupportedEncodingException e) {
+          e.printStackTrace();
+      }
+
+      //Step.2 AutoPoi 导出Excel
+      ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
+      List<ProWorkLogic> pageList = proWorkLogicService.list(queryWrapper);
+      //导出文件名称
+      mv.addObject(NormalExcelConstants.FILE_NAME, "日志(实施，开发，服务)列表");
+      mv.addObject(NormalExcelConstants.CLASS, ProWorkLogic.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<ProWorkLogic> listProWorkLogics = ExcelImportUtil.importExcel(file.getInputStream(), ProWorkLogic.class, params);
+              for (ProWorkLogic proWorkLogicExcel : listProWorkLogics) {
+                  proWorkLogicService.save(proWorkLogicExcel);
+              }
+              return Result.ok("文件导入成功！数据行数：" + listProWorkLogics.size());
+          } catch (Exception e) {
+              log.error(e.getMessage());
+              return Result.error("文件导入失败！");
+          } finally {
+              try {
+                  file.getInputStream().close();
+              } catch (IOException e) {
+                  e.printStackTrace();
+              }
+          }
+      }
+      return Result.ok("文件导入失败！");
+  }
+
+}

src/main/java/org/jeecg/modules/prowork/entity/ProWorkLogic.java

@@ -0,0 +1,85 @@
+package org.jeecg.modules.prowork.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+
+/**
+ * @Description: 日志(实施，开发，服务)
+ * @author： jeecg-boot
+ * @date：   2021-03-02
+ * @version： V1.0
+ */
+@Data
+@TableName("pro_work_logic")
+public class ProWorkLogic implements Serializable {
+	private static final long serialVersionUID = -7003016308321068677L;
+	@ApiModelProperty("id")
+	@TableId(type = IdType.UUID)
+	private String id;
+	@ApiModelProperty("单据编号")
+	private String billcode;
+	@ApiModelProperty("项目id")
+	private String proId;
+	@ApiModelProperty("项目名称")
+	private String proName;
+	@ApiModelProperty("开始日期")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+	private Date startDate;
+	@ApiModelProperty("结束日期")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+	private Date endDate;
+	@ApiModelProperty("里程碑id")
+	private String milesId;
+	@ApiModelProperty("里程碑(计划)")
+	private String milesName;
+	@ApiModelProperty("填写人(当前用户)")
+	private String currentUser;
+	@ApiModelProperty("创建时间")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+	private Date createTime;
+	@ApiModelProperty("创建人")
+	private String createBy;
+	@ApiModelProperty("修改时间")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+	private Date updateTime;
+	@ApiModelProperty("修改人")
+	private String updateBy;
+	@ApiModelProperty("删除状态（0，正常，1已删除）")
+	private String delFlag;
+	@ApiModelProperty("组织")
+	private String pkOrg;
+
+	public ProWorkLogic() {
+	}
+
+	public ProWorkLogic(String id, String billcode, String proId, String proName, Date startDate, Date endDate,
+						String milesId, String milesName, String currentUser, Date createTime, String createBy, Date updateTime,
+						String updateBy, String delFlag, String pkOrg) {
+		this.id = id;
+		this.billcode = billcode;
+		this.proId = proId;
+		this.proName = proName;
+		this.startDate = startDate;
+		this.endDate = endDate;
+		this.milesId = milesId;
+		this.milesName = milesName;
+		this.currentUser = currentUser;
+		this.createTime = createTime;
+		this.createBy = createBy;
+		this.updateTime = updateTime;
+		this.updateBy = updateBy;
+		this.delFlag = delFlag;
+		this.pkOrg = pkOrg;
+	}
+}

src/main/java/org/jeecg/modules/prowork/entity/ProWorkUpdateFile.java

@@ -0,0 +1,52 @@
+package org.jeecg.modules.prowork.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotation.IdType;
+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：   2021-02-26
+ * @version： V1.0
+ */
+@Data
+@TableName("pro_work_update_file")
+public class ProWorkUpdateFile implements Serializable {
+    private static final long serialVersionUID = 1L;
+    
+	/**id*/
+	@TableId(type = IdType.UUID)
+	private java.lang.String id;
+	/**文件路径*/
+	@Excel(name = "文件路径", width = 15)
+	private java.lang.String fileUrl;
+	/**创建时间*/
+	@Excel(name = "创建时间", 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 java.util.Date createTime;
+	/**创建人*/
+	@Excel(name = "创建人", width = 15)
+	private java.lang.String createBy;
+	/**修改时间*/
+	@Excel(name = "修改时间", 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 java.util.Date updateTime;
+	/**修改人*/
+	@Excel(name = "修改人", width = 15)
+	private java.lang.String updateBy;
+	/**删除状态（0，正常，1已删除）*/
+	@Excel(name = "删除状态（0，正常，1已删除）", width = 15)
+	private java.lang.String delFlag;
+	/**组织*/
+	@Excel(name = "组织", width = 15)
+	private java.lang.String pkOrg;
+}

src/main/java/org/jeecg/modules/prowork/entity/proWorkLogicContent.java

@@ -0,0 +1,75 @@
+package org.jeecg.modules.prowork.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+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：   2021-03-02
+ * @version： V1.0
+ */
+@Data
+@ApiModel(value = "日志详情(实施，开发，服务)")
+@TableName("pro_work_logic_content")
+public class proWorkLogicContent implements Serializable {
+    private static final long serialVersionUID = 1L;
+    @ApiModelProperty("id")
+	@TableId(type = IdType.UUID)
+	private String id;
+	@ApiModelProperty("日志id")
+	private String logicId;
+	@ApiModelProperty("项目档案id")
+	private String proArchivesId;
+	@ApiModelProperty("项目档案里程碑")
+	private String proArchivesMilestone;
+	@ApiModelProperty("工作内容")
+	private String content;
+	@ApiModelProperty("工作时长")
+	private Double duration;
+	@ApiModelProperty("创建时间")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+	private Date createTime;
+	@ApiModelProperty("创建人")
+	private String createBy;
+	@ApiModelProperty("修改时间")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+	private Date updateTime;
+	@ApiModelProperty("修改人")
+	private String updateBy;
+	@ApiModelProperty("删除状态（0，正常，1已删除）")
+	private String delFlag;
+	@ApiModelProperty("组织")
+	private String pkOrg;
+
+	public proWorkLogicContent() {
+	}
+
+	public proWorkLogicContent(String id, String logicId, String proArchivesId, String proArchivesMilestone, String content,
+	   Double duration, Date createTime, String createBy, Date updateTime, String updateBy, String delFlag, String pkOrg) {
+		this.id = id;
+		this.logicId = logicId;
+		this.proArchivesId = proArchivesId;
+		this.proArchivesMilestone = proArchivesMilestone;
+		this.content = content;
+		this.duration = duration;
+		this.createTime = createTime;
+		this.createBy = createBy;
+		this.updateTime = updateTime;
+		this.updateBy = updateBy;
+		this.delFlag = delFlag;
+		this.pkOrg = pkOrg;
+	}
+}

src/main/java/org/jeecg/modules/prowork/mapper/ProWorkLogicMapper.java

@@ -0,0 +1,19 @@
+package org.jeecg.modules.prowork.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.prowork.entity.ProWorkLogic;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 日志(实施，开发，服务)
+ * @author： jeecg-boot
+ * @date：   2021-03-02
+ * @version： V1.0
+ */
+@Mapper
+public interface ProWorkLogicMapper extends BaseMapper<ProWorkLogic> {
+
+}

src/main/java/org/jeecg/modules/prowork/mapper/ProWorkUpdateFileMapper.java

@@ -0,0 +1,17 @@
+package org.jeecg.modules.prowork.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.prowork.entity.ProWorkUpdateFile;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 项目工作--文件信息
+ * @author： jeecg-boot
+ * @date：   2021-02-26
+ * @version： V1.0
+ */
+public interface ProWorkUpdateFileMapper extends BaseMapper<ProWorkUpdateFile> {
+
+}

src/main/java/org/jeecg/modules/prowork/mapper/proWorkLogicContentMapper.java

@@ -0,0 +1,17 @@
+package org.jeecg.modules.prowork.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.prowork.entity.proWorkLogicContent;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 日志详情(实施，开发，服务)
+ * @author： jeecg-boot
+ * @date：   2021-03-02
+ * @version： V1.0
+ */
+public interface proWorkLogicContentMapper extends BaseMapper<proWorkLogicContent> {
+
+}

src/main/java/org/jeecg/modules/prowork/mapper/xml/ProWorkLogicContentMapper.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.prowork.mapper.proWorkLogicContentMapper">
+
+</mapper>

src/main/java/org/jeecg/modules/prowork/mapper/xml/ProWorkUpdateFileMapper.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.prowork.mapper.ProWorkUpdateFileMapper">
+
+</mapper>

src/main/java/org/jeecg/modules/prowork/mapper/xml/proWorkLogicMapper.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.prowork.mapper.ProWorkLogicMapper">
+
+</mapper>

src/main/java/org/jeecg/modules/prowork/service/ProWorkLogicService.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.prowork.service;
+
+import org.jeecg.modules.prowork.entity.ProWorkLogic;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: 日志(实施，开发，服务)
+ * @author： jeecg-boot
+ * @date：   2021-03-02
+ * @version： V1.0
+ */
+public interface ProWorkLogicService extends IService<ProWorkLogic> {
+
+}

src/main/java/org/jeecg/modules/prowork/service/ProWorkUpdateFileService.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.prowork.service;
+
+import org.jeecg.modules.prowork.entity.ProWorkUpdateFile;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: 项目工作--文件信息
+ * @author： jeecg-boot
+ * @date：   2021-02-26
+ * @version： V1.0
+ */
+public interface ProWorkUpdateFileService extends IService<ProWorkUpdateFile> {
+
+}

src/main/java/org/jeecg/modules/prowork/service/impl/ProWorkLogicServiceImpl.java

@@ -0,0 +1,18 @@
+package org.jeecg.modules.prowork.service.impl;
+
+import org.jeecg.modules.prowork.entity.ProWorkLogic;
+import org.jeecg.modules.prowork.mapper.ProWorkLogicMapper;
+import org.jeecg.modules.prowork.service.ProWorkLogicService;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 日志(实施，开发，服务)
+ * @author： jeecg-boot
+ * @date：   2021-03-02
+ * @version： V1.0
+ */
+@Service
+public class ProWorkLogicServiceImpl extends ServiceImpl<ProWorkLogicMapper, ProWorkLogic> implements ProWorkLogicService {
+
+}

src/main/java/org/jeecg/modules/prowork/service/impl/ProWorkUpdateFileServiceImpl.java

@@ -0,0 +1,18 @@
+package org.jeecg.modules.prowork.service.impl;
+
+import org.jeecg.modules.prowork.entity.ProWorkUpdateFile;
+import org.jeecg.modules.prowork.mapper.ProWorkUpdateFileMapper;
+import org.jeecg.modules.prowork.service.ProWorkUpdateFileService;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 项目工作--文件信息
+ * @author： jeecg-boot
+ * @date：   2021-02-26
+ * @version： V1.0
+ */
+@Service
+public class ProWorkUpdateFileServiceImpl extends ServiceImpl<ProWorkUpdateFileMapper, ProWorkUpdateFile> implements ProWorkUpdateFileService {
+
+}

src/main/java/org/jeecg/modules/prowork/service/impl/proWorkLogicContentServiceImpl.java

@@ -0,0 +1,17 @@
+package org.jeecg.modules.prowork.service.impl;
+
+import org.jeecg.modules.prowork.entity.proWorkLogicContent;
+import org.jeecg.modules.prowork.mapper.proWorkLogicContentMapper;
+import org.jeecg.modules.prowork.service.proWorkLogicContentService;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 日志详情(实施，开发，服务)
+ * @author： jeecg-boot
+ * @date：   2021-03-02
+ * @version： V1.0
+ */
+@Service
+public class proWorkLogicContentServiceImpl extends ServiceImpl<proWorkLogicContentMapper, proWorkLogicContent> implements proWorkLogicContentService {
+}

src/main/java/org/jeecg/modules/prowork/service/proWorkLogicContentService.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.prowork.service;
+
+import org.jeecg.modules.prowork.entity.proWorkLogicContent;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: 日志详情(实施，开发，服务)
+ * @author： jeecg-boot
+ * @date：   2021-03-02
+ * @version： V1.0
+ */
+public interface proWorkLogicContentService extends IService<proWorkLogicContent> {
+
+}