推送

module_kzks/src/main/java/org/jeecg/modules/kyTaskInfo/controller/KyTaskInfoController.java

@@ -0,0 +1,177 @@
+package org.jeecg.modules.kyTaskInfo.controller;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+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.kyTaskInfo.entity.KyTaskInfo;
+import org.jeecg.modules.kyTaskInfo.service.IKyTaskInfoService;
+
+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.jeecg.common.system.base.controller.JeecgController;
+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 io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.jeecg.common.aspect.annotation.AutoLog;
+
+ /**
+ * @Description: ky_task_info
+ * @Author: jeecg-boot
+ * @Date:   2023-08-30
+ * @Version: V1.0
+ */
+@Api(tags="ky_task_info")
+@RestController
+@RequestMapping("/kyTaskInfo/kyTaskInfo")
+@Slf4j
+public class KyTaskInfoController extends JeecgController<KyTaskInfo, IKyTaskInfoService> {
+	@Autowired
+	private IKyTaskInfoService kyTaskInfoService;
+	
+	/**
+	 * 分页列表查询
+	 *
+	 * @param kyTaskInfo
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "ky_task_info-分页列表查询")
+	@ApiOperation(value="ky_task_info-分页列表查询", notes="ky_task_info-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<KyTaskInfo>> queryPageList(KyTaskInfo kyTaskInfo,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<KyTaskInfo> queryWrapper = QueryGenerator.initQueryWrapper(kyTaskInfo, req.getParameterMap());
+		Page<KyTaskInfo> page = new Page<KyTaskInfo>(pageNo, pageSize);
+		IPage<KyTaskInfo> pageList = kyTaskInfoService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+	
+	/**
+	 *   添加
+	 *
+	 * @param kyTaskInfo
+	 * @return
+	 */
+	@AutoLog(value = "ky_task_info-添加")
+	@ApiOperation(value="ky_task_info-添加", notes="ky_task_info-添加")
+	//@RequiresPermissions("org.jeecg.modules:ky_task_info:add")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody KyTaskInfo kyTaskInfo) {
+		kyTaskInfoService.save(kyTaskInfo);
+		return Result.OK("添加成功！");
+	}
+	
+	/**
+	 *  编辑
+	 *
+	 * @param kyTaskInfo
+	 * @return
+	 */
+	@AutoLog(value = "ky_task_info-编辑")
+	@ApiOperation(value="ky_task_info-编辑", notes="ky_task_info-编辑")
+	//@RequiresPermissions("org.jeecg.modules:ky_task_info:edit")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody KyTaskInfo kyTaskInfo) {
+		kyTaskInfoService.updateById(kyTaskInfo);
+		return Result.OK("编辑成功!");
+	}
+	
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "ky_task_info-通过id删除")
+	@ApiOperation(value="ky_task_info-通过id删除", notes="ky_task_info-通过id删除")
+	//@RequiresPermissions("org.jeecg.modules:ky_task_info:delete")
+	@DeleteMapping(value = "/delete")
+	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+		kyTaskInfoService.removeById(id);
+		return Result.OK("删除成功!");
+	}
+	
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "ky_task_info-批量删除")
+	@ApiOperation(value="ky_task_info-批量删除", notes="ky_task_info-批量删除")
+	//@RequiresPermissions("org.jeecg.modules:ky_task_info:deleteBatch")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.kyTaskInfoService.removeByIds(Arrays.asList(ids.split(",")));
+		return Result.OK("批量删除成功!");
+	}
+	
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	//@AutoLog(value = "ky_task_info-通过id查询")
+	@ApiOperation(value="ky_task_info-通过id查询", notes="ky_task_info-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<KyTaskInfo> queryById(@RequestParam(name="id",required=true) String id) {
+		KyTaskInfo kyTaskInfo = kyTaskInfoService.getById(id);
+		if(kyTaskInfo==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(kyTaskInfo);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param kyTaskInfo
+    */
+    //@RequiresPermissions("org.jeecg.modules:ky_task_info:exportXls")
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, KyTaskInfo kyTaskInfo) {
+        return super.exportXls(request, kyTaskInfo, KyTaskInfo.class, "ky_task_info");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    //@RequiresPermissions("ky_task_info:importExcel")
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, KyTaskInfo.class);
+    }
+
+}

module_kzks/src/main/java/org/jeecg/modules/kyTaskInfo/entity/KyTaskInfo.java

@@ -0,0 +1,533 @@
+package org.jeecg.modules.kyTaskInfo.entity;
+
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.jeecg.common.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @Description: ky_task_info
+ * @Author: jeecg-boot
+ * @Date:   2023-08-30
+ * @Version: V1.0
+ */
+@Data
+@TableName("ky_task_info")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="ky_task_info对象", description="ky_task_info")
+public class KyTaskInfo implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**key*/
+	@Excel(name = "key", width = 15)
+    @ApiModelProperty(value = "key")
+    private java.lang.Integer key;
+	/**任务号*/
+	@Excel(name = "任务号", width = 15)
+    @ApiModelProperty(value = "任务号")
+    private java.lang.String taskno;
+	/**任务名称*/
+	@Excel(name = "任务名称", width = 15)
+    @ApiModelProperty(value = "任务名称")
+    private java.lang.String taskname;
+	/**modelid*/
+	@Excel(name = "modelid", width = 15)
+    @ApiModelProperty(value = "modelid")
+    private java.lang.Integer modelid;
+	/**ywbkid*/
+	@Excel(name = "ywbkid", width = 15)
+    @ApiModelProperty(value = "ywbkid")
+    private java.lang.Integer ywbkid;
+	/**ywbkname*/
+	@Excel(name = "ywbkname", width = 15)
+    @ApiModelProperty(value = "ywbkname")
+    private java.lang.String ywbkname;
+	/**型号id*/
+	@Excel(name = "型号id", width = 15)
+    @ApiModelProperty(value = "型号id")
+    private java.lang.String xhid;
+	/**型号名称*/
+	@Excel(name = "型号名称", width = 15)
+    @ApiModelProperty(value = "型号名称")
+    private java.lang.String xhname;
+	/**责任部门*/
+	@Excel(name = "责任部门", width = 15)
+    @ApiModelProperty(value = "责任部门")
+    private java.lang.String zrbm;
+	/**研制数量*/
+	@Excel(name = "研制数量", width = 15)
+    @ApiModelProperty(value = "研制数量")
+    private java.lang.Integer yzsl;
+	/**mjid*/
+	@Excel(name = "mjid", width = 15)
+    @ApiModelProperty(value = "mjid")
+    private java.lang.Integer mjid;
+	/**mjname*/
+	@Excel(name = "mjname", width = 15)
+    @ApiModelProperty(value = "mjname")
+    private java.lang.String mjname;
+	/**fxtid*/
+	@Excel(name = "fxtid", width = 15)
+    @ApiModelProperty(value = "fxtid")
+    private java.lang.Integer fxtid;
+	/**fxtname*/
+	@Excel(name = "fxtname", width = 15)
+    @ApiModelProperty(value = "fxtname")
+    private java.lang.String fxtname;
+	/**研制阶段id*/
+	@Excel(name = "研制阶段id", width = 15)
+    @ApiModelProperty(value = "研制阶段id")
+    private java.lang.Integer yzjdid;
+	/**研制阶段*/
+	@Excel(name = "研制阶段", width = 15)
+    @ApiModelProperty(value = "研制阶段")
+    private java.lang.String yzjdname;
+	/**任务来源*/
+	@Excel(name = "任务来源", width = 15)
+    @ApiModelProperty(value = "任务来源")
+    private java.lang.String tcdw;
+	/**任务来源简称*/
+	@Excel(name = "任务来源简称", width = 15)
+    @ApiModelProperty(value = "任务来源简称")
+    private java.lang.String brief;
+	/**rwnr*/
+	@Excel(name = "rwnr", width = 15)
+    @ApiModelProperty(value = "rwnr")
+    private java.lang.String rwnr;
+	/**wcxs*/
+	@Excel(name = "wcxs", width = 15)
+    @ApiModelProperty(value = "wcxs")
+    private java.lang.String wcxs;
+	/**jylbid*/
+	@Excel(name = "jylbid", width = 15)
+    @ApiModelProperty(value = "jylbid")
+    private java.lang.String jylbid;
+	/**jylbname*/
+	@Excel(name = "jylbname", width = 15)
+    @ApiModelProperty(value = "jylbname")
+    private java.lang.String jylbname;
+	/**1：横向 2：纵向*/
+	@Excel(name = "1：横向 2：纵向", width = 15)
+    @ApiModelProperty(value = "1：横向 2：纵向")
+    private java.lang.Integer hxzxid;
+	/**横向纵向*/
+	@Excel(name = "横向纵向", width = 15)
+    @ApiModelProperty(value = "横向纵向")
+    private java.lang.String hxzxname;
+	/**jjid*/
+	@Excel(name = "jjid", width = 15)
+    @ApiModelProperty(value = "jjid")
+    private java.lang.String jjid;
+	/**jjname*/
+	@Excel(name = "jjname", width = 15)
+    @ApiModelProperty(value = "jjname")
+    private java.lang.String jjname;
+	/**wzktid*/
+	@Excel(name = "wzktid", width = 15)
+    @ApiModelProperty(value = "wzktid")
+    private java.lang.String wzktid;
+	/**wzktname*/
+	@Excel(name = "wzktname", width = 15)
+    @ApiModelProperty(value = "wzktname")
+    private java.lang.String wzktname;
+	/**bz*/
+	@Excel(name = "bz", width = 15)
+    @ApiModelProperty(value = "bz")
+    private java.lang.String bz;
+	/**status*/
+	@Excel(name = "status", width = 15)
+    @ApiModelProperty(value = "status")
+    private java.lang.String status;
+	/**计划开始时间*/
+	@Excel(name = "计划开始时间", width = 15, format = "yyyy-MM-dd")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "计划开始时间")
+    private java.util.Date jhkssj;
+	/**计划完成时间（进度要求）*/
+	@Excel(name = "计划完成时间（进度要求）", width = 15, format = "yyyy-MM-dd")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "计划完成时间（进度要求）")
+    private java.util.Date jhwcsj;
+	/**下达部门id*/
+	@Excel(name = "下达部门id", width = 15)
+    @ApiModelProperty(value = "下达部门id")
+    private java.lang.String jycsid;
+	/**下达部门*/
+	@Excel(name = "下达部门", width = 15)
+    @ApiModelProperty(value = "下达部门")
+    private java.lang.String jycs;
+	/**jyfzrid*/
+	@Excel(name = "jyfzrid", width = 15)
+    @ApiModelProperty(value = "jyfzrid")
+    private java.lang.String jyfzrid;
+	/**jyfzrname*/
+	@Excel(name = "jyfzrname", width = 15)
+    @ApiModelProperty(value = "jyfzrname")
+    private java.lang.String jyfzrname;
+	/**计划开始时间*/
+	@Excel(name = "计划开始时间", width = 15)
+    @ApiModelProperty(value = "计划开始时间")
+    private java.lang.String ztdd;
+	/**计划完成时间*/
+	@Excel(name = "计划完成时间", width = 15)
+    @ApiModelProperty(value = "计划完成时间")
+    private java.lang.String ztddname;
+	/**sybdd*/
+	@Excel(name = "sybdd", width = 15)
+    @ApiModelProperty(value = "sybdd")
+    private java.lang.String sybdd;
+	/**sybddname*/
+	@Excel(name = "sybddname", width = 15)
+    @ApiModelProperty(value = "sybddname")
+    private java.lang.String sybddname;
+	/**ywfzr*/
+	@Excel(name = "ywfzr", width = 15)
+    @ApiModelProperty(value = "ywfzr")
+    private java.lang.String ywfzr;
+	/**ywfzrname*/
+	@Excel(name = "ywfzrname", width = 15)
+    @ApiModelProperty(value = "ywfzrname")
+    private java.lang.String ywfzrname;
+	/**zlgcs*/
+	@Excel(name = "zlgcs", width = 15)
+    @ApiModelProperty(value = "zlgcs")
+    private java.lang.String zlgcs;
+	/**zlgcsname*/
+	@Excel(name = "zlgcsname", width = 15)
+    @ApiModelProperty(value = "zlgcsname")
+    private java.lang.String zlgcsname;
+	/**cpbzr*/
+	@Excel(name = "cpbzr", width = 15)
+    @ApiModelProperty(value = "cpbzr")
+    private java.lang.String cpbzr;
+	/**cpbzrname*/
+	@Excel(name = "cpbzrname", width = 15)
+    @ApiModelProperty(value = "cpbzrname")
+    private java.lang.String cpbzrname;
+	/**实际开始时间*/
+	@Excel(name = "实际开始时间", width = 15, format = "yyyy-MM-dd")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "实际开始时间")
+    private java.util.Date sjkssj;
+	/**实际完成时间*/
+	@Excel(name = "实际完成时间", width = 15, format = "yyyy-MM-dd")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "实际完成时间")
+    private java.util.Date sjwcsj;
+	/**avidm*/
+	@Excel(name = "avidm", width = 15)
+    @ApiModelProperty(value = "avidm")
+    private java.lang.String avidm;
+	/**任务下达时间*/
+	@Excel(name = "任务下达时间", width = 15, format = "yyyy-MM-dd")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "任务下达时间")
+    private java.util.Date lrsj;
+	/**xhzzr*/
+	@Excel(name = "xhzzr", width = 15)
+    @ApiModelProperty(value = "xhzzr")
+    private java.lang.String xhzzr;
+	/**xhzzrname*/
+	@Excel(name = "xhzzrname", width = 15)
+    @ApiModelProperty(value = "xhzzrname")
+    private java.lang.String xhzzrname;
+	/**csbh*/
+	@Excel(name = "csbh", width = 15)
+    @ApiModelProperty(value = "csbh")
+    private java.lang.String csbh;
+	/**ywcs*/
+	@Excel(name = "ywcs", width = 15)
+    @ApiModelProperty(value = "ywcs")
+    private java.lang.String ywcs;
+	/**id*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "id")
+    private java.lang.String id;
+	/**pncode*/
+	@Excel(name = "pncode", width = 15)
+    @ApiModelProperty(value = "pncode")
+    private java.lang.String pncode;
+	/**emergent*/
+	@Excel(name = "emergent", width = 15)
+    @ApiModelProperty(value = "emergent")
+    private java.lang.String emergent;
+	/**zrbmGuid*/
+	@Excel(name = "zrbmGuid", width = 15)
+    @ApiModelProperty(value = "zrbmGuid")
+    private java.lang.String zrbmGuid;
+	/**业务员*/
+	@Excel(name = "业务员", width = 15)
+    @ApiModelProperty(value = "业务员")
+    private java.lang.String businessman;
+	/**审计审价*/
+	@Excel(name = "审计审价", width = 15)
+    @ApiModelProperty(value = "审计审价")
+    private java.lang.String auditprice;
+	/**任务类型*/
+	@Excel(name = "任务类型", width = 15)
+    @ApiModelProperty(value = "任务类型")
+    private java.lang.String tasktype;
+	/**tasktypes*/
+	@Excel(name = "tasktypes", width = 15)
+    @ApiModelProperty(value = "tasktypes")
+    private java.lang.String tasktypes;
+	/**项目进度*/
+	@Excel(name = "项目进度", width = 15)
+    @ApiModelProperty(value = "项目进度")
+    private java.lang.String processpercent;
+	/**预估价*/
+	@Excel(name = "预估价", width = 15)
+    @ApiModelProperty(value = "预估价")
+    private java.lang.String estimationcoat;
+	/**任务状态*/
+	@Excel(name = "任务状态", width = 15)
+    @ApiModelProperty(value = "任务状态")
+    private java.lang.String iflag;
+	/**processdate*/
+	@Excel(name = "processdate", width = 15, format = "yyyy-MM-dd")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "processdate")
+    private java.util.Date processdate;
+	/**processuser*/
+	@Excel(name = "processuser", width = 15)
+    @ApiModelProperty(value = "processuser")
+    private java.lang.String processuser;
+	/**父级任务*/
+	@Excel(name = "父级任务", width = 15)
+    @ApiModelProperty(value = "父级任务")
+    private java.lang.String reftaskno;
+	/**是否需要质保*/
+	@Excel(name = "是否需要质保", width = 15)
+    @ApiModelProperty(value = "是否需要质保")
+    private java.lang.String warranty;
+	/**质保单位*/
+	@Excel(name = "质保单位", width = 15)
+    @ApiModelProperty(value = "质保单位")
+    private java.lang.String warrantyunit;
+	/**合同额*/
+	@Excel(name = "合同额", width = 15)
+    @ApiModelProperty(value = "合同额")
+    private java.lang.String contractlimit;
+	/**businessmanname*/
+	@Excel(name = "businessmanname", width = 15)
+    @ApiModelProperty(value = "businessmanname")
+    private java.lang.String businessmanname;
+	/**批产任务号*/
+	@Excel(name = "批产任务号", width = 15)
+    @ApiModelProperty(value = "批产任务号")
+    private java.lang.String pccode;
+	/**备产任务号*/
+	@Excel(name = "备产任务号", width = 15)
+    @ApiModelProperty(value = "备产任务号")
+    private java.lang.String bccode;
+	/**备料任务号*/
+	@Excel(name = "备料任务号", width = 15)
+    @ApiModelProperty(value = "备料任务号")
+    private java.lang.String blcode;
+	/**gdtext*/
+	@Excel(name = "gdtext", width = 15)
+    @ApiModelProperty(value = "gdtext")
+    private java.lang.String gdtext;
+	/**contractsign*/
+	@Excel(name = "contractsign", width = 15)
+    @ApiModelProperty(value = "contractsign")
+    private java.lang.String contractsign;
+	/**thirdparty*/
+	@Excel(name = "thirdparty", width = 15)
+    @ApiModelProperty(value = "thirdparty")
+    private java.lang.String thirdparty;
+	/**考核扣款*/
+	@Excel(name = "考核扣款", width = 15)
+    @ApiModelProperty(value = "考核扣款")
+    private java.lang.String khkk;
+	/**currenttask*/
+	@Excel(name = "currenttask", width = 15)
+    @ApiModelProperty(value = "currenttask")
+    private java.lang.String currenttask;
+	/**isunittestproject*/
+	@Excel(name = "isunittestproject", width = 15)
+    @ApiModelProperty(value = "isunittestproject")
+    private java.lang.String isunittestproject;
+	/**管控等级*/
+	@Excel(name = "管控等级", width = 15)
+    @ApiModelProperty(value = "管控等级")
+    private java.lang.String gkdj;
+	/**zjname*/
+	@Excel(name = "zjname", width = 15)
+    @ApiModelProperty(value = "zjname")
+    private java.lang.String zjname;
+	/**zhuazhorgidname*/
+	@Excel(name = "zhuazhorgidname", width = 15)
+    @ApiModelProperty(value = "zhuazhorgidname")
+    private java.lang.String zhuazhorgidname;
+	/**任务分类*/
+	@Excel(name = "任务分类", width = 15)
+    @ApiModelProperty(value = "任务分类")
+    private java.lang.String specialtask;
+	/**主任务编号*/
+	@Excel(name = "主任务编号", width = 15)
+    @ApiModelProperty(value = "主任务编号")
+    private java.lang.String mainprojectno;
+	/**合同乙方*/
+	@Excel(name = "合同乙方", width = 15)
+    @ApiModelProperty(value = "合同乙方")
+    private java.lang.String htyf;
+	/**是否决算*/
+	@Excel(name = "是否决算", width = 15)
+    @ApiModelProperty(value = "是否决算")
+    private java.lang.String isjues;
+	/**projectaccountno*/
+	@Excel(name = "projectaccountno", width = 15)
+    @ApiModelProperty(value = "projectaccountno")
+    private java.lang.String projectaccountno;
+	/**projectgatherno*/
+	@Excel(name = "projectgatherno", width = 15)
+    @ApiModelProperty(value = "projectgatherno")
+    private java.lang.String projectgatherno;
+	/**基线编号*/
+	@Excel(name = "基线编号", width = 15)
+    @ApiModelProperty(value = "基线编号")
+    private java.lang.String jxno;
+	/**issendtogongchzhx*/
+	@Excel(name = "issendtogongchzhx", width = 15)
+    @ApiModelProperty(value = "issendtogongchzhx")
+    private java.lang.String issendtogongchzhx;
+	/**应用部位*/
+	@Excel(name = "应用部位", width = 15)
+    @ApiModelProperty(value = "应用部位")
+    private java.lang.String application;
+	/**pay*/
+	@Excel(name = "pay", width = 15)
+    @ApiModelProperty(value = "pay")
+    private java.lang.String pay;
+	/**评测方*/
+	@Excel(name = "评测方", width = 15)
+    @ApiModelProperty(value = "评测方")
+    private java.lang.String reviewer;
+	/**softwaretype1*/
+	@Excel(name = "softwaretype1", width = 15)
+    @ApiModelProperty(value = "softwaretype1")
+    private java.lang.String softwaretype1;
+	/**software*/
+	@Excel(name = "software", width = 15)
+    @ApiModelProperty(value = "software")
+    private java.lang.String software;
+	/**foreigntrade*/
+	@Excel(name = "foreigntrade", width = 15)
+    @ApiModelProperty(value = "foreigntrade")
+    private java.lang.String foreigntrade;
+	/**jfqk*/
+	@Excel(name = "jfqk", width = 15)
+    @ApiModelProperty(value = "jfqk")
+    private java.lang.String jfqk;
+	/**wzsbno*/
+	@Excel(name = "wzsbno", width = 15)
+    @ApiModelProperty(value = "wzsbno")
+    private java.lang.String wzsbno;
+	/**产品规格*/
+	@Excel(name = "产品规格", width = 15)
+    @ApiModelProperty(value = "产品规格")
+    private java.lang.String productspec;
+	/**name*/
+	@Excel(name = "name", width = 15)
+    @ApiModelProperty(value = "name")
+    private java.lang.String name;
+	/**briefname*/
+	@Excel(name = "briefname", width = 15)
+    @ApiModelProperty(value = "briefname")
+    private java.lang.String briefname;
+	/**processpercent1*/
+	@Excel(name = "processpercent1", width = 15)
+    @ApiModelProperty(value = "processpercent1")
+    private java.lang.String processpercent1;
+	/**estimationcoat1*/
+	@Excel(name = "estimationcoat1", width = 15)
+    @ApiModelProperty(value = "estimationcoat1")
+    private java.lang.String estimationcoat1;
+	/**物资计划员*/
+	@Excel(name = "物资计划员", width = 15)
+    @ApiModelProperty(value = "物资计划员")
+    private java.lang.String wzjhyname;
+	/**warrantybasis*/
+	@Excel(name = "warrantybasis", width = 15)
+    @ApiModelProperty(value = "warrantybasis")
+    private java.lang.String warrantybasis;
+	/**costprice*/
+	@Excel(name = "costprice", width = 15)
+    @ApiModelProperty(value = "costprice")
+    private java.lang.String costprice;
+	/**isbaox*/
+	@Excel(name = "isbaox", width = 15)
+    @ApiModelProperty(value = "isbaox")
+    private java.lang.String isbaox;
+	/**软件类型*/
+	@Excel(name = "软件类型", width = 15)
+    @ApiModelProperty(value = "软件类型")
+    private java.lang.String softwaretype;
+	/**有无软件*/
+	@Excel(name = "有无软件", width = 15)
+    @ApiModelProperty(value = "有无软件")
+    private java.lang.String ishavesoftware;
+	/**completeremark*/
+	@Excel(name = "completeremark", width = 15)
+    @ApiModelProperty(value = "completeremark")
+    private java.lang.String completeremark;
+	/**zj*/
+	@Excel(name = "zj", width = 15)
+    @ApiModelProperty(value = "zj")
+    private java.lang.String zj;
+	/**exampletest*/
+	@Excel(name = "exampletest", width = 15)
+    @ApiModelProperty(value = "exampletest")
+    private java.lang.String exampletest;
+	/**taskarea*/
+	@Excel(name = "taskarea", width = 15)
+    @ApiModelProperty(value = "taskarea")
+    private java.lang.String taskarea;
+	/**fundsfrom*/
+	@Excel(name = "fundsfrom", width = 15)
+    @ApiModelProperty(value = "fundsfrom")
+    private java.lang.String fundsfrom;
+	/**examplequantity*/
+	@Excel(name = "examplequantity", width = 15)
+    @ApiModelProperty(value = "examplequantity")
+    private java.lang.String examplequantity;
+	/**invoicetype*/
+	@Excel(name = "invoicetype", width = 15)
+    @ApiModelProperty(value = "invoicetype")
+    private java.lang.String invoicetype;
+	/**cbgcsname*/
+	@Excel(name = "cbgcsname", width = 15)
+    @ApiModelProperty(value = "cbgcsname")
+    private java.lang.String cbgcsname;
+	/**producttype*/
+	@Excel(name = "producttype", width = 15)
+    @ApiModelProperty(value = "producttype")
+    private java.lang.String producttype;
+	/**completeremarkdatetime*/
+	@Excel(name = "completeremarkdatetime", width = 15, format = "yyyy-MM-dd")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "completeremarkdatetime")
+    private java.util.Date completeremarkdatetime;
+}

module_kzks/src/main/java/org/jeecg/modules/kyTaskInfo/mapper/KyTaskInfoMapper.java

@@ -0,0 +1,17 @@
+package org.jeecg.modules.kyTaskInfo.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.kyTaskInfo.entity.KyTaskInfo;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: ky_task_info
+ * @Author: jeecg-boot
+ * @Date:   2023-08-30
+ * @Version: V1.0
+ */
+public interface KyTaskInfoMapper extends BaseMapper<KyTaskInfo> {
+
+}

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

module_kzks/src/main/java/org/jeecg/modules/kyTaskInfo/service/IKyTaskInfoService.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.kyTaskInfo.service;
+
+import org.jeecg.modules.kyTaskInfo.entity.KyTaskInfo;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: ky_task_info
+ * @Author: jeecg-boot
+ * @Date:   2023-08-30
+ * @Version: V1.0
+ */
+public interface IKyTaskInfoService extends IService<KyTaskInfo> {
+
+}

module_kzks/src/main/java/org/jeecg/modules/kyTaskInfo/service/impl/KyTaskInfoServiceImpl.java

@@ -0,0 +1,19 @@
+package org.jeecg.modules.kyTaskInfo.service.impl;
+
+import org.jeecg.modules.kyTaskInfo.entity.KyTaskInfo;
+import org.jeecg.modules.kyTaskInfo.mapper.KyTaskInfoMapper;
+import org.jeecg.modules.kyTaskInfo.service.IKyTaskInfoService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: ky_task_info
+ * @Author: jeecg-boot
+ * @Date:   2023-08-30
+ * @Version: V1.0
+ */
+@Service
+public class KyTaskInfoServiceImpl extends ServiceImpl<KyTaskInfoMapper, KyTaskInfo> implements IKyTaskInfoService {
+
+}

module_kzks/src/main/java/org/jeecg/modules/projectPushList/controller/ProjectPushListController.java

@@ -1,42 +1,44 @@
 package org.jeecg.modules.projectPushList.controller;
 
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-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.projectPushList.entity.ProjectPushList;
-import org.jeecg.modules.projectPushList.service.IProjectPushListService;
-
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 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.jeecg.common.api.vo.Result;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.common.aspect.annotation.PermissionData;
 import org.jeecg.common.system.base.controller.JeecgController;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.modules.kyTaskInfo.entity.KyTaskInfo;
+import org.jeecg.modules.kyTaskInfo.service.IKyTaskInfoService;
+import org.jeecg.modules.projectCost.entity.ProjectCost;
+import org.jeecg.modules.projectCost.service.IProjectCostService;
+import org.jeecg.modules.projectPushList.convert.ProjectPushListConvert;
+import org.jeecg.modules.projectPushList.entity.ProjectPushList;
+import org.jeecg.modules.projectPushList.service.IProjectPushListService;
+import org.jeecg.modules.projectPushList.vo.UserNameIDVO;
+import org.jeecg.modules.projectPushSet.entity.ProjectPushSet;
+import org.jeecg.modules.projectPushSet.service.IProjectPushSetService;
+import org.jeecg.modules.system.entity.SysDepart;
+import org.jeecg.modules.system.entity.SysUser;
+import org.jeecg.modules.system.service.ISysDepartService;
+import org.jeecg.modules.system.service.ISysUserDepartService;
+import org.jeecg.modules.system.service.ISysUserService;
 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 io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.jeecg.common.aspect.annotation.AutoLog;
 
- /**
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
  * @Description: 推送列表
  * @Author: jeecg-boot
  * @Date:   2023-08-09
@@ -49,7 +51,202 @@ import org.jeecg.common.aspect.annotation.AutoLog;
 public class ProjectPushListController extends JeecgController<ProjectPushList, IProjectPushListService> {
 	@Autowired
 	private IProjectPushListService projectPushListService;
-	
+	@Autowired
+	private IProjectPushSetService projectPushSetService;
+	@Autowired
+	private IProjectCostService costService;
+	@Autowired
+	private ISysUserDepartService userDepartService;
+	@Autowired
+	private IKyTaskInfoService kyTaskInfoService;
+	@Autowired
+	private ISysUserService sysUserService;
+	@Autowired
+	private ISysDepartService departService;
+	/**
+	 *   项目成本——寻找并新增推送
+	 */
+	@AutoLog(value = "项目成本——寻找并新增推送")
+	@ApiOperation(value="项目成本——寻找并新增推送", notes="项目成本——寻找并新增推送")
+	@PostMapping(value = "/addAll")
+	public Result<String> addAll() {
+		projectPushListService.truncateTable();
+
+		QueryWrapper<ProjectPushSet> queryWrapper = new QueryWrapper<>();
+		queryWrapper.eq("cost_type","0");// 0材料费
+		List<ProjectPushSet> list1 = projectPushSetService.list(queryWrapper);
+		queryWrapper = new QueryWrapper<>();
+		queryWrapper.eq("cost_type","1");// 1外协费
+		List<ProjectPushSet> list2 = projectPushSetService.list(queryWrapper);
+		queryWrapper = new QueryWrapper<>();
+		queryWrapper.eq("cost_type","2");// 2人工费
+		List<ProjectPushSet> list3 = projectPushSetService.list(queryWrapper);
+		//3合同额
+		queryWrapper = new QueryWrapper<>();
+		queryWrapper.eq("cost_type","3");
+		List<ProjectPushSet> list4 = projectPushSetService.list(queryWrapper);
+		//4收款额
+		queryWrapper = new QueryWrapper<>();
+		queryWrapper.eq("cost_type","5");
+		List<ProjectPushSet> list5 = projectPushSetService.list(queryWrapper);
+
+		List<ProjectPushList> pushList = new ArrayList<>();//所有的推送列表
+
+		// 0材料费
+		if(list1!=null && !list1.isEmpty()){
+			QueryWrapper<ProjectCost> projectCostQueryWrapper;
+			for(ProjectPushSet set : list1){
+				String stage = set.getStage();
+				projectCostQueryWrapper = new QueryWrapper<>();
+				projectCostQueryWrapper.eq("clf",new BigDecimal(0));
+				projectCostQueryWrapper.eq("cost_percent",stage);
+				List<ProjectCost> projectCostList1 = costService.list(projectCostQueryWrapper);
+
+				List<String> roleIds = Arrays.asList(set.getPushTo().split(","));
+				List<UserNameIDVO> userNameIdList = projectPushListService.userNamesByRoleIds(roleIds);
+
+				for (UserNameIDVO vo: userNameIdList){
+					//根据用户id查其所属部门的部门编码
+					List<String> sysOrgCodeList = projectPushListService.selectDeptCodeByUserId(vo.getUserId());
+					String sysOrgCodes = sysOrgCodeList.stream().collect(Collectors.joining(","));
+
+					for (ProjectCost cost:projectCostList1){
+						ProjectPushList push = ProjectPushListConvert.INSTANCE.toProjectPushList(
+								cost.getTaskno(),cost.getTaskname(),set.getId(), vo.getUsername(), set.getContent(),sysOrgCodes);
+						pushList.add(push);
+					}
+				}
+			}
+		}
+		// 1外协费
+		if(list2!=null && !list2.isEmpty()){
+			QueryWrapper<ProjectCost> projectCostQueryWrapper;
+			for(ProjectPushSet set : list2){
+				String stage = set.getStage();
+				projectCostQueryWrapper = new QueryWrapper<>();
+				projectCostQueryWrapper.eq("wxf",new BigDecimal(0));
+				projectCostQueryWrapper.eq("cost_percent",stage);
+				List<ProjectCost> projectCostList1 = costService.list(projectCostQueryWrapper);
+
+				List<String> roleIds = Arrays.asList(set.getPushTo().split(","));
+				List<UserNameIDVO> userNameIdList = projectPushListService.userNamesByRoleIds(roleIds);
+
+				for (UserNameIDVO vo: userNameIdList){
+					//根据用户id查其所属部门的部门编码
+					List<String> sysOrgCodeList = projectPushListService.selectDeptCodeByUserId(vo.getUserId());
+					String sysOrgCodes = sysOrgCodeList.stream().collect(Collectors.joining(","));
+
+					for (ProjectCost cost:projectCostList1){
+						ProjectPushList push = ProjectPushListConvert.INSTANCE.toProjectPushList(
+								cost.getTaskno(),cost.getTaskname(),set.getId(), vo.getUsername(), set.getContent(),sysOrgCodes);
+						pushList.add(push);
+					}
+				}
+			}
+		}
+		// 2人工费(工资及劳务费)
+		if(list3!=null && !list3.isEmpty()){
+			QueryWrapper<ProjectCost> projectCostQueryWrapper;
+			for(ProjectPushSet set : list3){
+				String stage = set.getStage();
+				projectCostQueryWrapper = new QueryWrapper<>();
+				projectCostQueryWrapper.eq("gzjlwf",new BigDecimal(0));
+				projectCostQueryWrapper.eq("cost_percent",stage);
+				List<ProjectCost> projectCostList1 = costService.list(projectCostQueryWrapper);
+				List<String> roleIds = Arrays.asList(set.getPushTo().split(","));
+				List<UserNameIDVO> userNameIdList = projectPushListService.userNamesByRoleIds(roleIds);
+
+				for (UserNameIDVO vo: userNameIdList){
+					//根据用户id查其所属部门的部门编码
+					List<String> sysOrgCodeList = projectPushListService.selectDeptCodeByUserId(vo.getUserId());
+					String sysOrgCodes = sysOrgCodeList.stream().collect(Collectors.joining(","));
+
+					for (ProjectCost cost:projectCostList1){
+						ProjectPushList push = ProjectPushListConvert.INSTANCE.toProjectPushList(
+								cost.getTaskno(),cost.getTaskname(),set.getId(), vo.getUsername(), set.getContent(),sysOrgCodes);
+						pushList.add(push);
+					}
+				}
+			}
+		}
+		//3合同额
+		if(list4!=null && !list4.isEmpty()){
+			QueryWrapper<ProjectCost> projectCostQueryWrapper;
+			for(ProjectPushSet set : list4){
+				String stage = set.getStage();
+				projectCostQueryWrapper = new QueryWrapper<>();
+				projectCostQueryWrapper.eq("contractfpe",new BigDecimal(0));
+				projectCostQueryWrapper.eq("cost_percent",stage);
+				List<ProjectCost> projectCostList1 = costService.list(projectCostQueryWrapper);
+
+				for (ProjectCost cost:projectCostList1){
+					String taskno = cost.getTaskno();
+					String orgcode = null;
+					String username = null;
+					if(taskno!=null){
+						QueryWrapper<KyTaskInfo> taskInfoQueryWrapper = new QueryWrapper<>();
+						taskInfoQueryWrapper.eq("taskno",cost.getTaskno());
+						KyTaskInfo kyTaskInfo = kyTaskInfoService.getOne(taskInfoQueryWrapper);
+						if(kyTaskInfo!=null){
+							if(kyTaskInfo.getJycsid()!=null){//下达部门id
+								SysDepart sysDepart = departService.getById(kyTaskInfo.getJycsid());
+								if(sysDepart!=null) orgcode = sysDepart.getOrgCode();
+							}
+							if(kyTaskInfo.getBusinessman()!=null){
+								QueryWrapper<SysUser> wrapper = new QueryWrapper<>();
+								wrapper.eq("realname",kyTaskInfo.getBusinessman());
+								SysUser user = sysUserService.getOne(wrapper);
+								if(user!=null) username=user.getUsername();
+							}
+						}
+					}
+					ProjectPushList push = ProjectPushListConvert.INSTANCE.toProjectPushList(
+							cost.getTaskno(),cost.getTaskname(),set.getId(), username, set.getContent(),orgcode);
+					pushList.add(push);
+				}
+			}
+		}
+		//4收款额
+		if(list5!=null && !list5.isEmpty()){
+			QueryWrapper<ProjectCost> projectCostQueryWrapper;for(ProjectPushSet set : list5){
+				String stage = set.getStage();
+				projectCostQueryWrapper = new QueryWrapper<>();
+				projectCostQueryWrapper.eq("taskmoney",new BigDecimal(0));
+				projectCostQueryWrapper.eq("cost_percent",stage);
+				List<ProjectCost> projectCostList1 = costService.list(projectCostQueryWrapper);
+
+				for (ProjectCost cost:projectCostList1){
+					String taskno = cost.getTaskno();
+					String orgcode = null;
+					String username = null;
+					if(taskno!=null){
+						QueryWrapper<KyTaskInfo> taskInfoQueryWrapper = new QueryWrapper<>();
+						taskInfoQueryWrapper.eq("taskno",cost.getTaskno());
+						KyTaskInfo kyTaskInfo = kyTaskInfoService.getOne(taskInfoQueryWrapper);
+						if(kyTaskInfo!=null){
+							if(kyTaskInfo.getJycsid()!=null){//下达部门id
+								SysDepart sysDepart = departService.getById(kyTaskInfo.getJycsid());
+								if(sysDepart!=null) orgcode = sysDepart.getOrgCode();
+							}
+							if(kyTaskInfo.getBusinessman()!=null){
+								QueryWrapper<SysUser> wrapper = new QueryWrapper<>();
+								wrapper.eq("realname",kyTaskInfo.getBusinessman());
+								SysUser user = sysUserService.getOne(wrapper);
+								if(user!=null) username=user.getUsername();
+							}
+						}
+					}
+					ProjectPushList push = ProjectPushListConvert.INSTANCE.toProjectPushList(
+							cost.getTaskno(),cost.getTaskname(),set.getId(), username, set.getContent(),orgcode);
+					pushList.add(push);
+				}
+			}
+		}
+		projectPushListService.saveBatch(pushList);
+		return Result.OK("添加成功！");
+	}
+
+
 	/**
 	 * 分页列表查询
 	 *
@@ -59,6 +256,7 @@ public class ProjectPushListController extends JeecgController<ProjectPushList,
 	 * @param req
 	 * @return
 	 */
+	@PermissionData(pageComponent = "module_kzks/projectPushList/ProjectPushListList")
 	//@AutoLog(value = "推送列表-分页列表查询")
 	@ApiOperation(value="推送列表-分页列表查询", notes="推送列表-分页列表查询")
 	@GetMapping(value = "/list")
@@ -71,7 +269,7 @@ public class ProjectPushListController extends JeecgController<ProjectPushList,
 		IPage<ProjectPushList> pageList = projectPushListService.page(page, queryWrapper);
 		return Result.OK(pageList);
 	}
-	
+
 	/**
 	 *   添加
 	 *
@@ -86,7 +284,7 @@ public class ProjectPushListController extends JeecgController<ProjectPushList,
 		projectPushListService.save(projectPushList);
 		return Result.OK("添加成功！");
 	}
-	
+
 	/**
 	 *  编辑
 	 *
@@ -101,7 +299,7 @@ public class ProjectPushListController extends JeecgController<ProjectPushList,
 		projectPushListService.updateById(projectPushList);
 		return Result.OK("编辑成功!");
 	}
-	
+
 	/**
 	 *   通过id删除
 	 *
@@ -116,7 +314,7 @@ public class ProjectPushListController extends JeecgController<ProjectPushList,
 		projectPushListService.removeById(id);
 		return Result.OK("删除成功!");
 	}
-	
+
 	/**
 	 *  批量删除
 	 *
@@ -131,7 +329,7 @@ public class ProjectPushListController extends JeecgController<ProjectPushList,
 		this.projectPushListService.removeByIds(Arrays.asList(ids.split(",")));
 		return Result.OK("批量删除成功!");
 	}
-	
+
 	/**
 	 * 通过id查询
 	 *

module_kzks/src/main/java/org/jeecg/modules/projectPushList/convert/ProjectPushListConvert.java

@@ -16,5 +16,6 @@ public interface ProjectPushListConvert {
 
     ProjectPushListConvert INSTANCE = Mappers.getMapper(ProjectPushListConvert .class);
 
-    ProjectPushList toProjectPushList(String taskno, String taskname,String pushSetId, String pushTo,String content);
+    @Mapping(target = "sysOrgCode",source = "sysOrgCode")
+    ProjectPushList toProjectPushList(String taskno, String taskname,String pushSetId, String pushTo,String content,String sysOrgCode);
 }

module_kzks/src/main/java/org/jeecg/modules/projectPushList/mapper/ProjectPushListMapper.java

@@ -2,9 +2,10 @@ package org.jeecg.modules.projectPushList.mapper;
 
 import java.util.List;
 
-import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 import org.jeecg.modules.projectPushList.entity.ProjectPushList;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.projectPushList.vo.UserNameIDVO;
 
 /**
  * @Description: 推送列表
@@ -14,4 +15,14 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface ProjectPushListMapper extends BaseMapper<ProjectPushList> {
 
+    /**清空推送列表*/
+    @Select("truncate table kzks_project_push_list")
+    public void truncateTable();
+
+    /**根据角色id找对应的用户及其部门*/
+    public List<UserNameIDVO> userNamesByRoleIds(List<String> roleIds);
+
+    /**根据用户id查其所属部门的部门编码*/
+    public List<String> selectDeptCodeByUserId(String userId);
+
 }

module_kzks/src/main/java/org/jeecg/modules/projectPushList/mapper/xml/ProjectPushListMapper.xml

@@ -2,4 +2,21 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.jeecg.modules.projectPushList.mapper.ProjectPushListMapper">
 
-</mapper>
+
+    <select id="userNamesByRoleIds" resultType="org.jeecg.modules.projectPushList.vo.UserNameIDVO">
+        select u.id as userId, u.username from sys_user u
+            left join sys_user_role ur on u.id = ur.user_id
+            left join sys_role r on r.id = ur.role_id
+        where r.id in
+        <foreach collection="roleIds" index="index" item="roleId" open="(" separator="," close=")">
+            #{roleId}
+        </foreach>
+    </select>
+
+    <select id="selectDeptCodeByUserId" resultType="String">
+        select org_code from sys_depart d
+            left join sys_user_depart ud on d.id = ud.dep_id
+        where ud.user_id = #{userId};
+    </select>
+
+</mapper>

module_kzks/src/main/java/org/jeecg/modules/projectPushList/service/IProjectPushListService.java

@@ -2,6 +2,9 @@ package org.jeecg.modules.projectPushList.service;
 
 import org.jeecg.modules.projectPushList.entity.ProjectPushList;
 import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.projectPushList.vo.UserNameIDVO;
+
+import java.util.List;
 
 /**
  * @Description: 推送列表
@@ -11,4 +14,13 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface IProjectPushListService extends IService<ProjectPushList> {
 
+    /**清空推送列表*/
+    public void truncateTable();
+
+    /**根据用户id查其所属部门的部门编码*/
+    public List<String> selectDeptCodeByUserId(String userId);
+
+    /**根据角色id找对应的用户及其部门*/
+    public List<UserNameIDVO> userNamesByRoleIds(List<String> roleIds);
+
 }

module_kzks/src/main/java/org/jeecg/modules/projectPushList/service/impl/ProjectPushListServiceImpl.java

@@ -1,12 +1,20 @@
 package org.jeecg.modules.projectPushList.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import org.jeecg.modules.projectPushList.entity.ProjectPushList;
 import org.jeecg.modules.projectPushList.mapper.ProjectPushListMapper;
 import org.jeecg.modules.projectPushList.service.IProjectPushListService;
+import org.jeecg.modules.projectPushList.vo.UserNameIDVO;
+import org.jeecg.modules.projectPushSet.entity.ProjectPushSet;
+import org.jeecg.modules.projectPushSet.mapper.ProjectPushSetMapper;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * @Description: 推送列表
  * @Author: jeecg-boot
@@ -16,4 +24,37 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 @Service
 public class ProjectPushListServiceImpl extends ServiceImpl<ProjectPushListMapper, ProjectPushList> implements IProjectPushListService {
 
+    @Autowired
+    @SuppressWarnings("all")
+    private ProjectPushSetMapper setMapper;
+    @Autowired
+    @SuppressWarnings("all")
+    private ProjectPushListMapper pushListMapper;
+
+    /**清空推送列表*/
+    public void truncateTable(){
+        pushListMapper.truncateTable();
+    }
+
+    /**根据用户id查其所属部门的部门编码*/
+    public List<String> selectDeptCodeByUserId(String userId){
+        return pushListMapper.selectDeptCodeByUserId(userId);
+    }
+
+    /**根据角色id找对应的用户及其部门*/
+    public List<UserNameIDVO> userNamesByRoleIds(List<String> roleIds){
+        return pushListMapper.userNamesByRoleIds(roleIds);
+    }
+
+    public List<ProjectPushList> addPushList(){
+        //成本类型：材料费0、外协费1、人工费2
+        QueryWrapper<ProjectPushSet> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("cost_type",0);
+        List<ProjectPushSet> setList = setMapper.selectList(queryWrapper);
+
+
+        List<ProjectPushList> pushListList = new ArrayList<>();
+        return pushListList;
+    }
+
 }

module_kzks/src/main/java/org/jeecg/modules/projectPushList/vo/UserNameIDVO.java

@@ -0,0 +1,24 @@
+package org.jeecg.modules.projectPushList.vo;
+
+import lombok.Data;
+import org.jeecgframework.poi.excel.annotation.Excel;
+
+import java.io.Serializable;
+
+@Data
+public class UserNameIDVO  implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 用户id
+     */
+    private String userId;
+    /**
+     * 登录账号
+     */
+    @Excel(name = "登录账号", width = 15)
+    private String username;
+
+
+}