首页+task数据新增修改各逻辑

itdmServer/module-iTDM/pom.xml

@@ -14,6 +14,15 @@
     <dependencies>
         <dependency>
             <groupId>org.jeecgframework.boot</groupId>
+            <artifactId>jeecg-system-biz</artifactId>
+        </dependency>
+        <!-- websocket -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-websocket</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jeecgframework.boot</groupId>
             <artifactId>jeecg-boot-base-core</artifactId>
         </dependency>
         <dependency>

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/gongdandetail/service/impl/ItdmGongdanQuerenServiceImpl.java

@@ -1,24 +1,28 @@
 package org.jeecg.modules.gongdandetail.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.jeecg.modules.gongdandetail.convert.GongdanDetailConvert;
 import org.jeecg.modules.gongdandetail.dto.ItdmGongdanDetailEditDTO;
 import org.jeecg.modules.gongdandetail.service.IItdmGongdanQuerenService;
+import org.jeecg.modules.itdmFirstPage.entity.ItdmTask;
+import org.jeecg.modules.itdmFirstPage.mapper.ItdmTaskMapper;
 import org.jeecg.modules.itdmGongDan.entity.ItdmGongdanDetail;
-import org.jeecg.modules.itdmGongDan.mapper.ItdmGongdanDetailMapper;
 import org.jeecg.modules.itdmGongDan.entity.ItdmGongdanMaster;
+import org.jeecg.modules.itdmGongDan.entity.ItdmTestPlan;
+import org.jeecg.modules.itdmGongDan.mapper.ItdmGongdanDetailMapper;
 import org.jeecg.modules.itdmGongDan.mapper.ItdmGongdanMasterMapper;
 import org.jeecg.modules.itdmGongDan.mapper.ItdmTestPlanMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.function.Supplier;
 
 /**
@@ -39,6 +43,10 @@ public class ItdmGongdanQuerenServiceImpl extends ServiceImpl<ItdmGongdanDetailM
     @SuppressWarnings("all")
     private ItdmTestPlanMapper itdmTestPlanMapper;
 
+    @Autowired
+    @SuppressWarnings("all")
+    private ItdmTaskMapper taskMapper;
+
     @Override
     public void queren(ItdmGongdanDetailEditDTO itdmGongdanDetail) throws ParseException {
 
@@ -74,6 +82,28 @@ public class ItdmGongdanQuerenServiceImpl extends ServiceImpl<ItdmGongdanDetailM
             master.setShijiEndDate(getMax(list, simpleDate, simpleDate1));
             master.setShijiStartDate(getMin(list, simpleDate, simpleDate1));
             masterMapper.updateById(master);
+
+            //===============修改task
+            ItdmGongdanMaster master1 = masterMapper.selectById(data.getWoId());
+            ItdmTestPlan plan = itdmTestPlanMapper.selectById(master1.getJihuaShiyanId());
+            Map<String, Object> planMap = new HashMap<>();
+            planMap.put("weituo_id",plan.getWeituoId());
+            List<ItdmTestPlan> plans = itdmTestPlanMapper.selectByMap(planMap);
+            int num =0;
+            for (ItdmTestPlan p:plans){
+                List<ItdmGongdanMaster> masters = masterMapper.selectList(Wrappers.lambdaQuery(ItdmGongdanMaster.class).eq(ItdmGongdanMaster::getJihuaShiyanId,p.getId()));
+                for (ItdmGongdanMaster m:masters){
+                    if(m.getShijiEndDate()==null) num++;
+                }
+            }
+            if(num==0){
+                ItdmTask t = new ItdmTask();
+                t.setTaskStatus(2);
+                UpdateWrapper<ItdmTask> updateWrapper = new UpdateWrapper<>();
+                updateWrapper.eq("weituo_id",plan.getWeituoId());
+                taskMapper.update(t,updateWrapper);
+            }
+
         }
 
 

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmFirstPage/controller/ItdmTaskController.java

@@ -0,0 +1,249 @@
+package org.jeecg.modules.itdmFirstPage.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 com.baomidou.mybatisplus.core.conditions.Wrapper;
+import org.apache.shiro.SecurityUtils;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.system.vo.LoginUser;
+import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.itdmFirstPage.convert.ItdmTaskConvert;
+import org.jeecg.modules.itdmFirstPage.entity.ItdmTask;
+import org.jeecg.modules.itdmFirstPage.service.IItdmTaskService;
+
+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.itdmFirstPage.vo.ItdmTaskListVO;
+import org.jeecg.modules.system.entity.SysUserRole;
+import org.jeecg.modules.system.service.ISysRoleService;
+import org.jeecg.modules.system.service.ISysUserRoleService;
+import org.jeecg.modules.weituo.entity.ItdmWeituoInfo;
+import org.jeecg.modules.weituo.service.IItdmWeituoInfoService;
+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: 任务表
+ * @Author: jeecg-boot
+ * @Date:   2023-06-03
+ * @Version: V1.0
+ */
+@Api(tags="任务表")
+@RestController
+@RequestMapping("/itdmFirstPage/itdmTask")
+@Slf4j
+public class ItdmTaskController extends JeecgController<ItdmTask, IItdmTaskService> {
+	@Autowired
+	private IItdmTaskService itdmTaskService;
+	@Autowired
+	private ISysUserRoleService sysUserRoleService;
+	@Autowired
+	private ISysRoleService roleService;
+	@Autowired
+	private IItdmWeituoInfoService weituoInfoService;
+
+
+	 /**
+      * 分页列表查询
+      *
+      * @param itdmTask
+      * @param pageNo
+      * @param pageSize
+      * @param req
+      * @return
+      */
+	//@AutoLog(value = "任务表-分页列表查询")
+	@ApiOperation(value="任务表-分页列表查询", notes="任务表-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<List<ItdmTaskListVO>> queryPageList(ItdmTask itdmTask,
+												 @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+												 @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+												 HttpServletRequest req) {
+		LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+		String realName = loginUser.getRealname(); // 登录人姓名
+
+		if(!realName.equals("管理员")){
+			itdmTask.setTaskUser(realName);
+
+			SysUserRole userRole = new SysUserRole();
+			userRole.setUserId(loginUser.getId());
+			Wrapper<SysUserRole> userRoleWrapper = new QueryWrapper<>(userRole);
+			List<SysUserRole> userRoleList = sysUserRoleService.list(userRoleWrapper);
+			if(userRoleList != null && !userRoleList.isEmpty() && userRoleList.get(0)!=null){
+				List<String> roles = userRoleList.stream().map(i->{
+					return roleService.getById(i.getRoleId()).getRoleName();
+				}).collect(Collectors.toList());
+
+				String role = roles.get(0); // 登录人角色，一般只有一个
+				itdmTask.setTaskRole(role);
+			}
+		}
+
+		QueryWrapper<ItdmTask> queryWrapper = QueryGenerator.initQueryWrapper(itdmTask, req.getParameterMap());
+		List<ItdmTask> pageList = itdmTaskService.list(queryWrapper);
+		List<ItdmTaskListVO> list = pageList.stream().map(i->{
+			ItdmWeituoInfo weituoInfo = weituoInfoService.getById(i.getWeituoId());
+			String weituoNo = weituoInfo.getWeituoNo();
+			String weituoClient = weituoInfo.getWeituoClient();
+			return ItdmTaskConvert.INSTANCE.convert(i,weituoNo,weituoClient);
+		}).collect(Collectors.toList());
+		return Result.OK(list);
+	}
+//	public Result<IPage<ItdmTask>> queryPageList(ItdmTask itdmTask,
+//								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+//								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+//								   HttpServletRequest req) {
+//		LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+//		String realName = loginUser.getRealname(); // 登录人姓名
+//
+//		if(!realName.equals("管理员")){
+//			itdmTask.setTaskUser(realName);
+//
+//			SysUserRole userRole = new SysUserRole();
+//			userRole.setUserId(loginUser.getId());
+//			Wrapper<SysUserRole> userRoleWrapper = new QueryWrapper<>(userRole);
+//			List<SysUserRole> userRoleList = sysUserRoleService.list(userRoleWrapper);
+//			if(userRoleList != null && !userRoleList.isEmpty() && userRoleList.get(0)!=null){
+//				List<String> roles = userRoleList.stream().map(i->{
+//					return roleService.getById(i.getRoleId()).getRoleName();
+//				}).collect(Collectors.toList());
+//
+//				String role = roles.get(0); // 登录人角色，一般只有一个
+//				itdmTask.setTaskRole(role);
+//			}
+//		}
+//
+//		QueryWrapper<ItdmTask> queryWrapper = QueryGenerator.initQueryWrapper(itdmTask, req.getParameterMap());
+//		Page<ItdmTask> page = new Page<ItdmTask>(pageNo, pageSize);
+//		IPage<ItdmTask> pageList = itdmTaskService.page(page, queryWrapper);
+//		return Result.OK(pageList);
+//	}
+
+	/**
+	 *   添加
+	 *
+	 * @param itdmTask
+	 * @return
+	 */
+	@AutoLog(value = "任务表-添加")
+	@ApiOperation(value="任务表-添加", notes="任务表-添加")
+	//@RequiresPermissions("org.jeecg.modules:itdm_task:add")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody ItdmTask itdmTask) {
+		itdmTaskService.save(itdmTask);
+		return Result.OK("添加成功！");
+	}
+
+	/**
+	 *  编辑
+	 *
+	 * @param itdmTask
+	 * @return
+	 */
+	@AutoLog(value = "任务表-编辑")
+	@ApiOperation(value="任务表-编辑", notes="任务表-编辑")
+	//@RequiresPermissions("org.jeecg.modules:itdm_task:edit")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody ItdmTask itdmTask) {
+		itdmTaskService.updateById(itdmTask);
+		return Result.OK("编辑成功!");
+	}
+
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "任务表-通过id删除")
+	@ApiOperation(value="任务表-通过id删除", notes="任务表-通过id删除")
+	//@RequiresPermissions("org.jeecg.modules:itdm_task:delete")
+	@DeleteMapping(value = "/delete")
+	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+		itdmTaskService.removeById(id);
+		return Result.OK("删除成功!");
+	}
+
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "任务表-批量删除")
+	@ApiOperation(value="任务表-批量删除", notes="任务表-批量删除")
+	//@RequiresPermissions("org.jeecg.modules:itdm_task:deleteBatch")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.itdmTaskService.removeByIds(Arrays.asList(ids.split(",")));
+		return Result.OK("批量删除成功!");
+	}
+
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	//@AutoLog(value = "任务表-通过id查询")
+	@ApiOperation(value="任务表-通过id查询", notes="任务表-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<ItdmTask> queryById(@RequestParam(name="id",required=true) String id) {
+		ItdmTask itdmTask = itdmTaskService.getById(id);
+		if(itdmTask==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(itdmTask);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param itdmTask
+    */
+    //@RequiresPermissions("org.jeecg.modules:itdm_task:exportXls")
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, ItdmTask itdmTask) {
+        return super.exportXls(request, itdmTask, ItdmTask.class, "任务表");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    //@RequiresPermissions("itdm_task:importExcel")
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, ItdmTask.class);
+    }
+
+}

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmFirstPage/controller/itdmFirstPageController.java

@@ -0,0 +1,93 @@
+package org.jeecg.modules.itdmFirstPage.controller;
+
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.shiro.SecurityUtils;
+import org.jeecg.common.system.vo.LoginUser;
+import org.jeecg.modules.itdmFirstPage.entity.ItdmTask;
+import org.jeecg.modules.itdmFirstPage.service.IItdmTaskService;
+import org.jeecg.modules.itdmFirstPage.vo.ItdmFirstPageVO;
+import org.jeecg.modules.system.entity.SysUserRole;
+import org.jeecg.modules.system.service.ISysRoleService;
+import org.jeecg.modules.system.service.ISysUserRoleService;
+import org.jeecg.modules.system.service.ISysUserService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+import java.util.stream.Collectors;
+
+
+@Api(tags="...首页")
+@RestController
+@RequestMapping("/itdmFirstPage")
+@Slf4j
+public class itdmFirstPageController {
+
+    @Autowired
+    private IItdmTaskService taskService;
+    @Autowired
+    private ISysUserRoleService sysUserRoleService;
+    @Autowired
+    private ISysRoleService roleService;
+
+    @ApiOperation(value="任务各种数量", notes="所有任务，待办，进行中，完成")
+    @GetMapping(value = "/getFrstPageTaskNum")
+    public ItdmFirstPageVO getFrstPageTaskNum(){
+        LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+        String realName = loginUser.getRealname(); // 登录人姓名
+
+        ItdmTask itdmTask = new ItdmTask();
+
+        if(!realName.equals("管理员")){
+            itdmTask.setTaskUser(realName);
+
+            SysUserRole userRole = new SysUserRole();
+            userRole.setUserId(loginUser.getId());
+            Wrapper<SysUserRole> userRoleWrapper = new QueryWrapper<>(userRole);
+            List<SysUserRole> userRoleList = sysUserRoleService.list(userRoleWrapper);
+            if(userRoleList != null && !userRoleList.isEmpty() && userRoleList.get(0)!=null){
+                List<String> roles = userRoleList.stream().map(i->{
+                    return roleService.getById(i.getRoleId()).getRoleName();
+                }).collect(Collectors.toList());
+
+                String role = roles.get(0); // 登录人角色，一般只有一个
+                itdmTask.setTaskRole(role);
+            }
+
+        }
+
+        Wrapper<ItdmTask> taskWrapper = new QueryWrapper<>(itdmTask);
+        Long totalNum = taskService.count(taskWrapper);
+
+        itdmTask.setTaskStatus(0);
+        taskWrapper = new QueryWrapper<>(itdmTask);
+        Long daibanNum = taskService.count(taskWrapper);
+
+        itdmTask.setTaskStatus(1);
+        taskWrapper = new QueryWrapper<>(itdmTask);
+        Long jinxingNum = taskService.count(taskWrapper);
+
+        itdmTask.setTaskStatus(2);
+        taskWrapper = new QueryWrapper<>(itdmTask);
+        Long wanchengNum =taskService.count(taskWrapper);
+
+        ItdmFirstPageVO firstPageVO = new ItdmFirstPageVO();
+        firstPageVO.setDaibanNum(daibanNum);
+        firstPageVO.setJinxingNum(jinxingNum);
+        firstPageVO.setWanchengNum(wanchengNum);
+        firstPageVO.setTotalNum(totalNum);
+
+        return firstPageVO;
+    }
+
+
+}

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmFirstPage/convert/ItdmTaskConvert.java

@@ -0,0 +1,20 @@
+package org.jeecg.modules.itdmFirstPage.convert;
+
+import org.jeecg.modules.itdmFirstPage.entity.ItdmTask;
+import org.jeecg.modules.itdmFirstPage.vo.ItdmTaskListVO;
+import org.mapstruct.Mapper;
+import org.mapstruct.Mapping;
+import org.mapstruct.ReportingPolicy;
+import org.mapstruct.factory.Mappers;
+import org.springframework.util.CollectionUtils;
+
+import java.util.stream.Collectors;
+
+@Mapper(unmappedTargetPolicy = ReportingPolicy.IGNORE,imports ={ CollectionUtils.class, Collectors.class})
+public interface ItdmTaskConvert {
+
+    ItdmTaskConvert INSTANCE = Mappers.getMapper(ItdmTaskConvert.class);
+
+    ItdmTaskListVO convert(ItdmTask itdmTask,String weituoNo,String weituoClient);
+
+}

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmFirstPage/entity/ItdmTask.java

@@ -0,0 +1,81 @@
+package org.jeecg.modules.itdmFirstPage.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: 任务表
+ * @Author: jeecg-boot
+ * @Date:   2023-06-03
+ * @Version: V1.0
+ */
+@Data
+@TableName("itdm_task")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="itdm_task对象", description="任务表")
+public class ItdmTask implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**任务表id*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "任务表id")
+    private java.lang.String id;
+	/**内容*/
+	@Excel(name = "内容", width = 15)
+    @ApiModelProperty(value = "内容")
+    private java.lang.String taskContent;
+	/**任务状态（0待办1进行2完成）*/
+	@Excel(name = "任务状态（0待办1进行2完成）", width = 15, dicCode = "task_status")
+	@Dict(dicCode = "task_status")
+    @ApiModelProperty(value = "任务状态（0待办1进行2完成）")
+    private java.lang.Integer taskStatus;
+	/**待办角色*/
+	@Excel(name = "待办角色", width = 15)
+    @ApiModelProperty(value = "待办角色")
+    private java.lang.String taskRole;
+	/**待办人员*/
+	@Excel(name = "待办人员", width = 15)
+    @ApiModelProperty(value = "待办人员")
+    private java.lang.String taskUser;
+	/**关联委托id*/
+	@Excel(name = "关联委托id", width = 15)
+    @ApiModelProperty(value = "关联委托id")
+    @Dict(dictTable = "itdm_weituo_info", dicText = "weituo_no", dicCode = "id")
+    private java.lang.String weituoId;
+	/**创建时间*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "创建时间")
+    private java.util.Date createTime;
+	/**创建人*/
+    @ApiModelProperty(value = "创建人")
+    private java.lang.String createBy;
+	/**修改时间*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "修改时间")
+    private java.util.Date updateTime;
+	/**修改人*/
+    @ApiModelProperty(value = "修改人")
+    private java.lang.String updateBy;
+	/**备注*/
+	@Excel(name = "备注", width = 15)
+    @ApiModelProperty(value = "备注")
+    private java.lang.String remark;
+}

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmFirstPage/mapper/ItdmTaskMapper.java

@@ -0,0 +1,17 @@
+package org.jeecg.modules.itdmFirstPage.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.itdmFirstPage.entity.ItdmTask;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 任务表
+ * @Author: jeecg-boot
+ * @Date:   2023-06-03
+ * @Version: V1.0
+ */
+public interface ItdmTaskMapper extends BaseMapper<ItdmTask> {
+
+}

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmFirstPage/mapper/xml/ItdmTaskMapper.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.itdmFirstPage.mapper.ItdmTaskMapper">
+
+</mapper>

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmFirstPage/service/IItdmTaskService.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.itdmFirstPage.service;
+
+import org.jeecg.modules.itdmFirstPage.entity.ItdmTask;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: 任务表
+ * @Author: jeecg-boot
+ * @Date:   2023-06-03
+ * @Version: V1.0
+ */
+public interface IItdmTaskService extends IService<ItdmTask> {
+
+}

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmFirstPage/service/impl/ItdmTaskServiceImpl.java

@@ -0,0 +1,19 @@
+package org.jeecg.modules.itdmFirstPage.service.impl;
+
+import org.jeecg.modules.itdmFirstPage.entity.ItdmTask;
+import org.jeecg.modules.itdmFirstPage.mapper.ItdmTaskMapper;
+import org.jeecg.modules.itdmFirstPage.service.IItdmTaskService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 任务表
+ * @Author: jeecg-boot
+ * @Date:   2023-06-03
+ * @Version: V1.0
+ */
+@Service
+public class ItdmTaskServiceImpl extends ServiceImpl<ItdmTaskMapper, ItdmTask> implements IItdmTaskService {
+
+}

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmFirstPage/vo/ItdmFirstPageVO.java

@@ -0,0 +1,31 @@
+package org.jeecg.modules.itdmFirstPage.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+import org.jeecgframework.poi.excel.annotation.Excel;
+
+import java.io.Serializable;
+
+@Data
+@Accessors(chain = true)
+public class ItdmFirstPageVO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**所有任务总数*/
+    @Excel(name = "所有任务总数", width = 15)
+    @ApiModelProperty(value = "所有任务总数")
+    private java.lang.Long totalNum;
+    /**待办任务总数*/
+    @Excel(name = "待办任务总数", width = 15)
+    @ApiModelProperty(value = "待办任务总数")
+    private java.lang.Long daibanNum;
+    /**进行中任务总数*/
+    @Excel(name = "进行中任务总数", width = 15)
+    @ApiModelProperty(value = "进行中任务总数")
+    private java.lang.Long jinxingNum;
+    /**完成任务总数*/
+    @Excel(name = "完成任务总数", width = 15)
+    @ApiModelProperty(value = "完成任务总数")
+    private java.lang.Long wanchengNum;
+}

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmFirstPage/vo/ItdmTaskListVO.java

@@ -0,0 +1,60 @@
+package org.jeecg.modules.itdmFirstPage.vo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+import org.jeecg.common.aspect.annotation.Dict;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+
+@Data
+@Accessors(chain = true)
+public class ItdmTaskListVO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**任务表id*/
+    @TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "任务表id")
+    private java.lang.String id;
+    /**内容*/
+    @Excel(name = "内容", width = 15)
+    @ApiModelProperty(value = "内容")
+    private java.lang.String taskContent;
+    /**任务状态（0待办1进行2完成）*/
+    @Excel(name = "任务状态（0待办1进行2完成）", width = 15, dicCode = "task_status")
+    @Dict(dicCode = "task_status")
+    @ApiModelProperty(value = "任务状态（0待办1进行2完成）")
+    private java.lang.Integer taskStatus;
+    /**待办角色*/
+    @Excel(name = "待办角色", width = 15)
+    @ApiModelProperty(value = "待办角色")
+    private java.lang.String taskRole;
+    /**待办人员*/
+    @Excel(name = "待办人员", width = 15)
+    @ApiModelProperty(value = "待办人员")
+    private java.lang.String taskUser;
+    /**关联委托id*/
+    @Excel(name = "关联委托id", width = 15)
+    @ApiModelProperty(value = "关联委托id")
+    @Dict(dictTable = "itdm_weituo_info", dicText = "weituo_no", dicCode = "id")
+    private java.lang.String weituoId;
+    /**委托编号*/
+    @Excel(name = "委托编号", width = 15)
+    @ApiModelProperty(value = "委托编号")
+    private java.lang.String weituoNo;
+    /**委托单位名称*/
+    @Excel(name = "委托单位名称", width = 15)
+    @ApiModelProperty(value = "委托单位名称")
+    private java.lang.String weituoClient;
+    /**创建时间*/
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "创建时间")
+    private java.util.Date createTime;
+
+}

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmGongDan/service/impl/ItdmJCXMSHJHServiceImpl.java

@@ -2,13 +2,14 @@ package org.jeecg.modules.itdmGongDan.service.impl;
 
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import org.jeecg.modules.itdmDevice.mapper.ItdmDeviceMapper;
+import org.jeecg.modules.itdmFirstPage.entity.ItdmTask;
+import org.jeecg.modules.itdmFirstPage.mapper.ItdmTaskMapper;
 import org.jeecg.modules.itdmGongDan.entity.ItdmGongdanDetail;
-import org.jeecg.modules.itdmGongDan.mapper.ItdmGongdanDetailMapper;
 import org.jeecg.modules.itdmGongDan.entity.ItdmGongdanMaster;
-import org.jeecg.modules.itdmGongDan.mapper.ItdmGongdanMasterMapper;
 import org.jeecg.modules.itdmGongDan.entity.ItdmTestPlan;
+import org.jeecg.modules.itdmGongDan.mapper.ItdmGongdanDetailMapper;
+import org.jeecg.modules.itdmGongDan.mapper.ItdmGongdanMasterMapper;
 import org.jeecg.modules.itdmGongDan.mapper.ItdmJCXMSHJHMapper;
 import org.jeecg.modules.itdmGongDan.mapper.ItdmTestPlanMapper;
 import org.jeecg.modules.itdmGongDan.service.IItdmJCXMSHJHService;
@@ -21,7 +22,10 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.web.bind.annotation.RequestBody;
 
-import java.util.*;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 
@@ -52,6 +56,9 @@ public class ItdmJCXMSHJHServiceImpl implements IItdmJCXMSHJHService {
     @Autowired
     @SuppressWarnings("all")
     private ItdmGongdanDetailMapper itdmGongdanDetailMapper;
+    @Autowired
+    @SuppressWarnings("all")
+    private ItdmTaskMapper taskMapper;
 
     /**
      *   删除2级工单master+对应的工单detail
@@ -66,6 +73,24 @@ public class ItdmJCXMSHJHServiceImpl implements IItdmJCXMSHJHService {
             columnMap.put("wo_id",id);
             itdmGongdanDetailMapper.deleteByMap(columnMap);
 
+            if(master.getWorker()!=null){
+                Map<String, Object> map = new HashMap<>();
+                map.put("jihua_shiyan_id",master.getJihuaShiyanId());
+                List<ItdmGongdanMaster> masterList = itdmGongdanMasterMapper.selectByMap(map);
+                int num =0;
+                for (ItdmGongdanMaster m: masterList){
+                    if (m.getWorker().equals(master.getWorker())) num++;
+                }
+                if(num==0){ //没有该操作员的任务了，删掉对应委托id和对应操作员的task
+                    ItdmTestPlan plan = itdmTestPlanMapper.selectById(master.getJihuaShiyanId());
+                    Map<String, Object> taskMap = new HashMap<>();
+                    taskMap.put("task_role","操作员");
+                    taskMap.put("task_user",master.getWorker());
+                    taskMap.put("weituo_id",plan.getWeituoId());
+                    taskMapper.deleteByMap(taskMap);
+                }
+            }
+
             return "删除成功!";
         }else  return "不可删除！";
     }
@@ -110,6 +135,33 @@ public class ItdmJCXMSHJHServiceImpl implements IItdmJCXMSHJHService {
                     detail.setChuanganqi(vo.getChuanganqi());
                     itdmGongdanDetailMapper.insert(detail);//新增对应日期的工单detail
                 }
+                //新增一条操作员工单制定的task
+                ItdmTask itdmTask = new ItdmTask();
+                itdmTask.setTaskRole("操作员");
+                itdmTask.setTaskUser(vo.getWorker());//操作员
+                itdmTask.setTaskStatus(0);//待办
+                itdmTask.setWeituoId(vo.getWeituoId());
+                itdmTask.setTaskContent("工单制定");
+                taskMapper.insert(itdmTask);
+                //修改项目经理拆解工单task状态为1进行中——需要先判断
+                Map<String, Object> testPlanMap = new HashMap<>();
+                testPlanMap.put("weituo_id",vo.getWeituoId());
+                List<ItdmTestPlan> testPlanList = itdmTestPlanMapper.selectByMap(testPlanMap);
+                int num =0;
+                for(ItdmTestPlan p:testPlanList){
+                    if(p.getStatus()==0) num++; //未确认
+                }
+                if(num==0){ //都已确认
+                    Map<String, Object> columnMap = new HashMap<>();
+                    columnMap.put("task_role","项目经理");
+                    columnMap.put("weituo_id",vo.getWeituoId());
+                    List<ItdmTask> taskList = taskMapper.selectByMap(columnMap);
+                    if(taskList!=null) {
+                        ItdmTask itdmTask1 = taskList.get(0);
+                        itdmTask1.setTaskStatus(1);
+                        taskMapper.updateById(itdmTask1);
+                    }
+                }
             }else {//非空，则修改——先判断能否修改
                 if(vo.getShijiStartDate()==null){//此时可以修改
                     //先修改工单master
@@ -142,6 +194,36 @@ public class ItdmJCXMSHJHServiceImpl implements IItdmJCXMSHJHService {
                         detail.setChuanganqi(vo.getChuanganqi());
                         itdmGongdanDetailMapper.insert(detail);//新增对应日期的工单detail
                     }
+
+                    //修改项目经理拆解工单task的操作员
+                    Map<String, Object> columnMap = new HashMap<>();
+                    columnMap.put("task_role","项目经理");
+                    columnMap.put("weituo_id",vo.getWeituoId());
+                    List<ItdmTask> taskList = taskMapper.selectByMap(columnMap);
+                    if(taskList!=null) {
+                        ItdmTask itdmTask1 = taskList.get(0);
+                        itdmTask1.setTaskUser(vo.getWorker());
+                        taskMapper.updateById(itdmTask1);
+                    }
+                    //修改项目经理拆解工单task状态为1进行中——需要先判断
+                    Map<String, Object> testPlanMap = new HashMap<>();
+                    testPlanMap.put("weituo_id",vo.getWeituoId());
+                    List<ItdmTestPlan> testPlanList = itdmTestPlanMapper.selectByMap(testPlanMap);
+                    int num =0;
+                    for(ItdmTestPlan p:testPlanList){
+                        if(p.getStatus()==0) num++; //未确认
+                    }
+                    if(num==0){ //都已确认
+                        Map<String, Object> map = new HashMap<>();
+                        map.put("task_role","项目经理");
+                        map.put("weituo_id",vo.getWeituoId());
+                        List<ItdmTask> tList = taskMapper.selectByMap(map);
+                        if(tList!=null) {
+                            ItdmTask itdmTask1 = tList.get(0);
+                            itdmTask1.setTaskStatus(1);
+                            taskMapper.updateById(itdmTask1);
+                        }
+                    }
                 }else msg="不可修改！";
             }
         }
@@ -198,9 +280,37 @@ public class ItdmJCXMSHJHServiceImpl implements IItdmJCXMSHJHService {
                     detail.setChuanganqi(vo.getChuanganqi());
                     itdmGongdanDetailMapper.insert(detail);
                 }
+                //新增一条项目经理计划拆单的task
+                ItdmTask itdmTask = new ItdmTask();
+                itdmTask.setTaskRole("项目经理");
+                itdmTask.setTaskUser(vo.getPm());
+                itdmTask.setTaskStatus(0);//待办
+                itdmTask.setWeituoId(vo.getWeituoId());
+                itdmTask.setTaskContent("计划拆单");
+                taskMapper.insert(itdmTask);
+                //修改计划员计划排期task状态为1进行中
+                Map<String, Object> columnMap = new HashMap<>();
+                columnMap.put("task_role","计划员");
+                columnMap.put("weituo_id",vo.getWeituoId());
+                List<ItdmTask> taskList = taskMapper.selectByMap(columnMap);
+                if(taskList!=null) {
+                    ItdmTask itdmTask1 = taskList.get(0);
+                    itdmTask1.setTaskStatus(1);
+                    taskMapper.updateById(itdmTask1);
+                }
             }else if(vo.getStatus() == 0){//状态为“未确定”，可以修改试验计划
                 itdmTestPlan.setId(vo.getTestPlanId());
                 itdmTestPlanMapper.updateById(itdmTestPlan);
+                //修改计划拆单的项目经理
+                Map<String, Object> columnMap = new HashMap<>();
+                columnMap.put("task_role","项目经理");
+                columnMap.put("weituo_id",vo.getWeituoId());
+                List<ItdmTask> taskList = taskMapper.selectByMap(columnMap);
+                if(taskList!=null) {
+                    ItdmTask itdmTask1 = taskList.get(0);
+                    itdmTask1.setTaskUser(vo.getPm());
+                    taskMapper.updateById(itdmTask1);
+                }
                 //查原来的工单master
                 Map<String, Object> masterMap = new HashMap<>();
                 masterMap.put("jihua_shiyan_id",itdmTestPlan.getId());

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmPersonManage/entity/ItdmPersonManage.java

@@ -80,4 +80,7 @@ public class ItdmPersonManage implements Serializable {
 	@Excel(name = "备注", width = 15)
     @ApiModelProperty(value = "备注")
     private java.lang.String remark;
+    /**用户id*/
+    @ApiModelProperty(value = "用户id")
+    private java.lang.String userId;
 }

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/weituo/controller/ItdmWeituoInfoController.java

@@ -11,6 +11,8 @@ import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.base.controller.JeecgController;
 import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.modules.itdmFirstPage.entity.ItdmTask;
+import org.jeecg.modules.itdmFirstPage.service.IItdmTaskService;
 import org.jeecg.modules.weituo.dto.WeituoInsertCommand;
 import org.jeecg.modules.weituo.dto.WeituoUpdateCommand;
 import org.jeecg.modules.weituo.entity.ItdmWeituoInfo;
@@ -23,9 +25,7 @@ import org.springframework.web.servlet.ModelAndView;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.text.SimpleDateFormat;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
 
 /**
  * @Description: 委托信息
@@ -40,7 +40,8 @@ import java.util.List;
 public class ItdmWeituoInfoController extends JeecgController<ItdmWeituoInfo, IItdmWeituoInfoService> {
 	@Autowired
 	private IItdmWeituoInfoService itdmWeituoInfoService;
-
+	@Autowired
+	private IItdmTaskService taskService;
 
 
 	/**根据委托单位查询委托信息列表*/
@@ -181,10 +182,13 @@ public class ItdmWeituoInfoController extends JeecgController<ItdmWeituoInfo, II
     public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
         return super.importExcel(request, response, ItdmWeituoInfo.class);
     }
-	 @AutoLog(value = "添加或编辑委托信息")
-	 @ApiOperation(value = "添加或编辑委托信息", notes = "添加或编辑委托信息")
-	 @RequestMapping("/saveOrUpdateWeituo")
-	 public Result<String> saveOrUpdateWeituo(@RequestBody ItdmWeituoInfo weituoInfo) {
+
+
+    /**审核通过或拒绝*/
+    @AutoLog(value = "添加或编辑委托信息")
+	@ApiOperation(value = "添加或编辑委托信息", notes = "添加或编辑委托信息")
+	@RequestMapping("/saveOrUpdateWeituo")
+	public Result<String> saveOrUpdateWeituo(@RequestBody ItdmWeituoInfo weituoInfo) {
 		 try {
 			 if (StringUtils.isBlank(weituoInfo.getId())) { // 添加
 				 weituoInfo.setCreateTime(new Date());
@@ -207,6 +211,28 @@ public class ItdmWeituoInfoController extends JeecgController<ItdmWeituoInfo, II
 				 }
 
 				 itdmWeituoInfoService.updateById(oldWeituo); // 调用 service 的更新方法
+
+				 if ("审核通过".equals(oldWeituo.getShenheStatus())){
+					 //新增一条该委托单计划员的task
+					 ItdmTask itdmTask = new ItdmTask();
+					 itdmTask.setTaskRole("计划员");
+//				 	 itdmTask.setTaskUser();
+					 itdmTask.setTaskStatus(0);//待办
+					 itdmTask.setWeituoId(weituoInfo.getId());
+					 itdmTask.setTaskContent("计划排期");
+					 taskService.save(itdmTask);
+					 //修改该委托单经理的task，状态改为1进行中
+					 Map<String, Object> columnMap = new HashMap<>();
+					 columnMap.put("task_role","经理");
+					 columnMap.put("weituo_id",weituoInfo.getId());
+					 List<ItdmTask> taskList = taskService.listByMap(columnMap);
+					 if(taskList!=null) {
+					 	ItdmTask itdmTask1 = taskList.get(0);
+						 itdmTask1.setTaskStatus(1);
+						 taskService.updateById(itdmTask1);
+					 }
+				 }
+
 			 }
 
 			 return Result.OK("操作成功！");

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/weituo/service/impl/ItdmWeituoInfoServiceImpl.java

@@ -3,6 +3,8 @@ package org.jeecg.modules.weituo.service.impl;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.jeecg.common.exception.JeecgBootException;
+import org.jeecg.modules.itdmFirstPage.entity.ItdmTask;
+import org.jeecg.modules.itdmFirstPage.mapper.ItdmTaskMapper;
 import org.jeecg.modules.weituo.common.ShenheStatus;
 import org.jeecg.modules.weituo.convert.WeituoConvert;
 import org.jeecg.modules.weituo.dto.WeituoInsertCommand;
@@ -19,7 +21,9 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.Objects;
 import java.util.stream.Collectors;
 
@@ -42,6 +46,10 @@ public class ItdmWeituoInfoServiceImpl extends ServiceImpl<ItdmWeituoInfoMapper,
     @Autowired
     private ItdmWeituoInfoMapper itdmWeituoInfoMapper;
 
+    @Autowired
+    private ItdmTaskMapper taskMapper;
+
+
     /**根据委托单位查询委托信息列表*/
     public List<ItdmWeituoInfo> selectWTListByClient(String weituoClient){
         return itdmWeituoInfoMapper.selectWTListByClient(weituoClient);
@@ -78,6 +86,14 @@ public class ItdmWeituoInfoServiceImpl extends ServiceImpl<ItdmWeituoInfoMapper,
 
         }
 
+        //新增一条经理待审核的task
+        ItdmTask itdmTask = new ItdmTask();
+        itdmTask.setTaskRole("经理");
+//        itdmTask.setTaskUser();
+        itdmTask.setTaskStatus(0);//待办
+        itdmTask.setWeituoId(itdmWeituoInfo.getId());
+        itdmTask.setTaskContent("委托审核");
+        taskMapper.insert(itdmTask);
 
     }
 
@@ -144,6 +160,10 @@ public class ItdmWeituoInfoServiceImpl extends ServiceImpl<ItdmWeituoInfoMapper,
         this.yangpinMapper.delete(Wrappers.lambdaQuery(ItdmWeituoYangpin.class).eq(ItdmWeituoYangpin::getWeituoId, id));
         this.yangpinExtendMapper.delete(Wrappers.lambdaQuery(ItdmWeituoYangpinExtend.class).eq(ItdmWeituoYangpinExtend::getWeituoId, id));
 
+        //删除对应委托id的task
+        Map<String, Object> map = new HashMap<>();
+        map.put("weituo_id",id);
+        taskMapper.deleteByMap(map);
     }
 
 

itdmServer/pom.xml

@@ -141,6 +141,14 @@
 
 
 		<dependencies>
+
+			<!-- iTDM 模块-->
+			<dependency>
+				<groupId>org.jeecgframework.boot</groupId>
+				<artifactId>module-iTDM</artifactId>
+				<version>${jeecgboot.version}</version>
+			</dependency>
+
 			<dependency>
 				<groupId>com.deepoove</groupId>
 				<artifactId>poi-tl</artifactId>