bonus
/
devicesmgt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

新购模块

This commit is contained in:
dingjie 2023-12-13 18:08:38 +08:00
parent 106bcfb26e
commit e0de45ada6
17 changed files with 651 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/PurchaseCheckDetailsController.java
View File

@ -5,6 +5,8 @@ import javax.servlet.http.HttpServletResponse;
import com.bonus.sgzb.material.service.IPurchaseCheckDetailsService;
import com.bonus.sgzb.material.domain.PurchaseCheckDetails;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
@ -29,6 +31,7 @@ import com.bonus.sgzb.common.core.web.page.TableDataInfo;
* @date 2023-12-10
*/
@RestController
@Api(value = "新购验收任务详细")
@RequestMapping("/purchaseCheckDetails")
public class PurchaseCheckDetailsController extends BaseController
{
@ -38,7 +41,7 @@ public class PurchaseCheckDetailsController extends BaseController
/**
* 查询新购验收任务详细列表
*/
@RequiresPermissions("domain:details:list")
@ApiOperation(value = "查询新购验收任务详细列表")
@GetMapping("/list")
public TableDataInfo list(PurchaseCheckDetails purchaseCheckDetails)
{
@ -63,7 +66,7 @@ public class PurchaseCheckDetailsController extends BaseController
/**
* 获取新购验收任务详细详细信息
*/
@RequiresPermissions("domain:details:query")
@ApiOperation(value = "获取新购验收任务详细详细信息")
@GetMapping(value = "/{taskId}")
public AjaxResult getInfo(@PathVariable("taskId") Long taskId)
{
@ -73,12 +76,12 @@ public class PurchaseCheckDetailsController extends BaseController
/**
* 新增新购验收任务详细
*/
@RequiresPermissions("domain:details:add")
@ApiOperation(value = "新增新购验收任务详细")
@Log(title = "新购验收任务详细", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody PurchaseCheckDetails purchaseCheckDetails)
public AjaxResult add(@RequestBody List<PurchaseCheckDetails> purchaseCheckDetailsList)
{
return toAjax(purchaseCheckDetailsService.insertPurchaseCheckDetails(purchaseCheckDetails));
return toAjax(purchaseCheckDetailsService.insertPurchaseCheckDetails(purchaseCheckDetailsList));
}
/**

7
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/PurchaseCheckInfoController.java
View File

@ -5,6 +5,8 @@ import javax.servlet.http.HttpServletResponse;
import com.bonus.sgzb.material.service.IPurchaseCheckInfoService;
import com.bonus.sgzb.material.domain.PurchaseCheckInfo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
@ -23,12 +25,13 @@ import com.bonus.sgzb.common.core.utils.poi.ExcelUtil;
import com.bonus.sgzb.common.core.web.page.TableDataInfo;
/**
* 新购验收任务Controller
* 新购验收任务
*
* @author bonus
* @date 2023-12-10
*/
@RestController
@Api(value = "新购验收任务")
@RequestMapping("/purchaseCheckInfo")
public class PurchaseCheckInfoController extends BaseController
{
@ -38,7 +41,7 @@ public class PurchaseCheckInfoController extends BaseController
/**
* 查询新购验收任务列表
*/
@RequiresPermissions("domain:info:list")
@ApiOperation("查询新购验收任务列表")
@GetMapping("/list")
public TableDataInfo list(PurchaseCheckInfo purchaseCheckInfo)
{

105
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/TmTaskController.java Normal file
View File

@ -0,0 +1,105 @@
package com.bonus.sgzb.material.controller;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
import com.bonus.sgzb.material.domain.TmTask;
import com.bonus.sgzb.material.service.ITmTaskService;
import org.springframework.beans.factory.annotation.Autowired;
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.DeleteMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.bonus.sgzb.common.log.annotation.Log;
import com.bonus.sgzb.common.log.enums.BusinessType;
import com.bonus.sgzb.common.security.annotation.RequiresPermissions;
import com.bonus.sgzb.common.core.web.controller.BaseController;
import com.bonus.sgzb.common.core.web.domain.AjaxResult;
import com.bonus.sgzb.common.core.utils.poi.ExcelUtil;
import com.bonus.sgzb.common.core.web.page.TableDataInfo;
/**
* 任务tm_taskController
*
* @author bonus
* @date 2023-12-13
*/
@RestController
@RequestMapping("/task")
public class TmTaskController extends BaseController
{
@Autowired
private ITmTaskService tmTaskService;
/**
* 查询任务tm_task列表
*/
@RequiresPermissions("system:task:list")
@GetMapping("/list")
public TableDataInfo list(TmTask tmTask)
{
startPage();
List<TmTask> list = tmTaskService.selectTmTaskList(tmTask);
return getDataTable(list);
}
/**
* 导出任务tm_task列表
*/
@RequiresPermissions("system:task:export")
@Log(title = "任务tm_task", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, TmTask tmTask)
{
List<TmTask> list = tmTaskService.selectTmTaskList(tmTask);
ExcelUtil<TmTask> util = new ExcelUtil<TmTask>(TmTask.class);
util.exportExcel(response, list, "任务tm_task数据");
}
/**
* 获取任务tm_task详细信息
*/
@RequiresPermissions("system:task:query")
@GetMapping(value = "/{taskId}")
public AjaxResult getInfo(@PathVariable("taskId") Long taskId)
{
return success(tmTaskService.selectTmTaskByTaskId(taskId));
}
/**
* 新增任务tm_task
*/
@RequiresPermissions("system:task:add")
@Log(title = "任务tm_task", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody TmTask tmTask)
{
return toAjax(tmTaskService.insertTmTask(tmTask));
}
/**
* 修改任务tm_task
*/
@RequiresPermissions("system:task:edit")
@Log(title = "任务tm_task", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody TmTask tmTask)
{
return toAjax(tmTaskService.updateTmTask(tmTask));
}
/**
* 删除任务tm_task
*/
@RequiresPermissions("system:task:remove")
@Log(title = "任务tm_task", businessType = BusinessType.DELETE)
@DeleteMapping("/{taskIds}")
public AjaxResult remove(@PathVariable Long[] taskIds)
{
return toAjax(tmTaskService.deleteTmTaskByTaskIds(taskIds));
}
}

62
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/PurchaseCheckDetails.java
View File

@ -5,6 +5,7 @@ import java.util.Date;
import com.bonus.sgzb.common.core.web.domain.BaseEntity;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.bonus.sgzb.common.core.annotation.Excel;
import io.swagger.annotations.ApiModelProperty;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
@ -18,34 +19,51 @@ public class PurchaseCheckDetails extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** 主键id */
private Long id;
/** 任务ID */
@ApiModelProperty(value = "任务ID")
private Long taskId;
/** 规格id */
@Excel(name = "规格id")
@ApiModelProperty(value = "规格id")
private Long typeId;
/** 采购单价 */
@Excel(name = "采购单价")
@ApiModelProperty(value = "采购单价")
private String purchasePrice;
/** 采购数量 */
@Excel(name = "采购数量")
@ApiModelProperty(value = "采购数量")
private Long purchaseNum;
/** 供应商id */
@Excel(name = "供应商id")
@ApiModelProperty(value = "供应商id")
private Long supplierId;
/** 供应商id */
@ApiModelProperty(value = "供应商名称")
private String supplier;
/** 出厂日期 */
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "出厂日期", width = 30, dateFormat = "yyyy-MM-dd")
@ApiModelProperty(value = "出厂日期")
private Date productionTime;
/** 数据所属组织 */
@Excel(name = "数据所属组织")
@ApiModelProperty(value = "数据所属组织")
private Long companyId;
/**
* 规格型号
*/
@ApiModelProperty(value = "规格型号")
private String specificationType;
@ApiModelProperty(value = "机具类型名称")
private String typeName;
public void setTaskId(Long taskId)
{
this.taskId = taskId;
@ -110,6 +128,38 @@ public class PurchaseCheckDetails extends BaseEntity
return companyId;
}
public Long getId() {
return id;
}
public void setId(Long id) {
this.id = id;
}
public String getSpecificationType() {
return specificationType;
}
public void setSpecificationType(String specificationType) {
this.specificationType = specificationType;
}
public String getTypeName() {
return typeName;
}
public void setTypeName(String typeName) {
this.typeName = typeName;
}
public String getSupplier() {
return supplier;
}
public void setSupplier(String supplier) {
this.supplier = supplier;
}
@Override
public String toString() {
return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)

48
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/PurchaseCheckInfo.java
View File

@ -5,6 +5,8 @@ import io.swagger.annotations.ApiModelProperty;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import java.util.List;
/**
* 新购验收任务
*
@ -35,6 +37,20 @@ public class PurchaseCheckInfo extends BaseEntity
@ApiModelProperty(value = "数据所属组织")
private Long companyId;
@ApiModelProperty(value = "采购单号")
private String code;
// 采购状态
@ApiModelProperty(value = "采购状态")
private String purchasingStatus;
// 采购状态
@ApiModelProperty(value = "采购机具设备")
private String purchasingTypeName;
@ApiModelProperty(value = "新购验收任务详情")
private List<PurchaseCheckDetails> checkDetailsList;
public void setTaskId(Long taskId)
{
this.taskId = taskId;
@ -81,6 +97,38 @@ public class PurchaseCheckInfo extends BaseEntity
return companyId;
}
public List<PurchaseCheckDetails> getCheckDetailsList() {
return checkDetailsList;
}
public void setCheckDetailsList(List<PurchaseCheckDetails> checkDetailsList) {
this.checkDetailsList = checkDetailsList;
}
public String getCode() {
return code;
}
public void setCode(String code) {
this.code = code;
}
public String getPurchasingStatus() {
return purchasingStatus;
}
public void setPurchasingStatus(String purchasingStatus) {
this.purchasingStatus = purchasingStatus;
}
public String getPurchasingTypeName() {
return purchasingTypeName;
}
public void setPurchasingTypeName(String purchasingTypeName) {
this.purchasingTypeName = purchasingTypeName;
}
@Override
public String toString() {
return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)

15
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/TmTask.java
View File

@ -1,38 +1,37 @@
package com.bonus.sgzb.material.domain;
import com.bonus.sgzb.common.core.annotation.Excel;
import com.bonus.sgzb.common.core.web.domain.BaseEntity;
import io.swagger.annotations.ApiModelProperty;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
/**
* 任务对象
* 任务tm_task对象 tm_task
*
* @author bonus
* @date 2023-12-10
* @date 2023-12-13
*/
public class TmTask extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** 任务ID */
@ApiModelProperty(value = "任务ID")
private Long taskId;
/** 任务类型(定义数据字典) */
@ApiModelProperty(value = "任务类型(定义数据字典)")
@Excel(name = "任务类型(定义数据字典)")
private Long taskType;
/** 任务状态(定义数据字典) */
@ApiModelProperty(value = "任务状态(定义数据字典)")
@Excel(name = "任务状态(定义数据字典)")
private Long taskStatus;
/** 编号 */
@ApiModelProperty(value = "编号")
@Excel(name = "编号")
private String code;
/** 数据所属组织 */
@ApiModelProperty(value = "数据所属组织")
@Excel(name = "数据所属组织")
private Long companyId;
public void setTaskId(Long taskId)

20
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/PurchaseCheckDetailsMapper.java
View File

@ -1,20 +1,20 @@
package com.bonus.sgzb.material.mapper;
import com.bonus.sgzb.material.domain.PurchaseCheckDetails;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* 新购验收任务详细purchase_check_detailsMapper接口
*
*
* @author bonus
* @date 2023-12-10
*/
public interface PurchaseCheckDetailsMapper
{
public interface PurchaseCheckDetailsMapper {
/**
* 查询新购验收任务详细purchase_check_details
*
*
* @param taskId 新购验收任务详细purchase_check_details主键
* @return 新购验收任务详细purchase_check_details
*/
@ -22,7 +22,7 @@ public interface PurchaseCheckDetailsMapper
/**
* 查询新购验收任务详细purchase_check_details列表
*
*
* @param purchaseCheckDetails 新购验收任务详细purchase_check_details
* @return 新购验收任务详细purchase_check_details集合
*/
@ -30,7 +30,7 @@ public interface PurchaseCheckDetailsMapper
/**
* 新增新购验收任务详细purchase_check_details
*
*
* @param purchaseCheckDetails 新购验收任务详细purchase_check_details
* @return 结果
*/
@ -38,7 +38,7 @@ public interface PurchaseCheckDetailsMapper
/**
* 修改新购验收任务详细purchase_check_details
*
*
* @param purchaseCheckDetails 新购验收任务详细purchase_check_details
* @return 结果
*/
@ -46,7 +46,7 @@ public interface PurchaseCheckDetailsMapper
/**
* 删除新购验收任务详细purchase_check_details
*
*
* @param taskId 新购验收任务详细purchase_check_details主键
* @return 结果
*/
@ -54,9 +54,11 @@ public interface PurchaseCheckDetailsMapper
/**
* 批量删除新购验收任务详细purchase_check_details
*
*
* @param taskIds 需要删除的数据主键集合
* @return 结果
*/
public int deletePurchaseCheckDetailsByTaskIds(Long[] taskIds);
int insertPurchaseCheckDetailsList(@Param("purchaseCheckDetailsList") List<PurchaseCheckDetails> purchaseCheckDetailsList);
}

2
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/PurchaseCheckInfoMapper.java
View File

@ -59,4 +59,6 @@ public interface PurchaseCheckInfoMapper
* @return 结果
*/
public int deletePurchaseCheckInfoByTaskIds(Long[] taskIds);
String selectTypeNameByTaskId(Long taskId);
}

61
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/TmTaskMapper.java Normal file
View File

@ -0,0 +1,61 @@
package com.bonus.sgzb.material.mapper;
import java.util.List;
import com.bonus.sgzb.material.domain.TmTask;
/**
* 任务tm_taskMapper接口
*
* @author bonus
* @date 2023-12-13
*/
public interface TmTaskMapper
{
/**
* 查询任务tm_task
*
* @param taskId 任务tm_task主键
* @return 任务tm_task
*/
public TmTask selectTmTaskByTaskId(Long taskId);
/**
* 查询任务tm_task列表
*
* @param tmTask 任务tm_task
* @return 任务tm_task集合
*/
public List<TmTask> selectTmTaskList(TmTask tmTask);
/**
* 新增任务tm_task
*
* @param tmTask 任务tm_task
* @return 结果
*/
public int insertTmTask(TmTask tmTask);
/**
* 修改任务tm_task
*
* @param tmTask 任务tm_task
* @return 结果
*/
public int updateTmTask(TmTask tmTask);
/**
* 删除任务tm_task
*
* @param taskId 任务tm_task主键
* @return 结果
*/
public int deleteTmTaskByTaskId(Long taskId);
/**
* 批量删除任务tm_task
*
* @param taskIds 需要删除的数据主键集合
* @return 结果
*/
public int deleteTmTaskByTaskIds(Long[] taskIds);
}

4
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/IPurchaseCheckDetailsService.java
View File

@ -31,10 +31,10 @@ public interface IPurchaseCheckDetailsService
/**
* 新增新购验收任务详细purchase_check_details
*
* @param purchaseCheckDetails 新购验收任务详细purchase_check_details
* @param purchaseCheckDetailsList 新购验收任务详细purchase_check_details
* @return 结果
*/
public int insertPurchaseCheckDetails(PurchaseCheckDetails purchaseCheckDetails);
public int insertPurchaseCheckDetails(List<PurchaseCheckDetails> purchaseCheckDetailsList);
/**
* 修改新购验收任务详细purchase_check_details

62
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/ITmTaskService.java Normal file
View File

@ -0,0 +1,62 @@
package com.bonus.sgzb.material.service;
import com.bonus.sgzb.material.domain.TmTask;
import java.util.List;
/**
* 任务tm_taskService接口
*
* @author bonus
* @date 2023-12-13
*/
public interface ITmTaskService
{
/**
* 查询任务tm_task
*
* @param taskId 任务tm_task主键
* @return 任务tm_task
*/
public TmTask selectTmTaskByTaskId(Long taskId);
/**
* 查询任务tm_task列表
*
* @param tmTask 任务tm_task
* @return 任务tm_task集合
*/
public List<TmTask> selectTmTaskList(TmTask tmTask);
/**
* 新增任务tm_task
*
* @param tmTask 任务tm_task
* @return 结果
*/
public int insertTmTask(TmTask tmTask);
/**
* 修改任务tm_task
*
* @param tmTask 任务tm_task
* @return 结果
*/
public int updateTmTask(TmTask tmTask);
/**
* 批量删除任务tm_task
*
* @param taskIds 需要删除的任务tm_task主键集合
* @return 结果
*/
public int deleteTmTaskByTaskIds(Long[] taskIds);
/**
* 删除任务tm_task信息
*
* @param taskId 任务tm_task主键
* @return 结果
*/
public int deleteTmTaskByTaskId(Long taskId);
}

9
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseCheckDetailsServiceImpl.java
View File

@ -48,14 +48,15 @@ public class PurchaseCheckDetailsServiceImpl implements IPurchaseCheckDetailsSer
/**
* 新增新购验收任务详细purchase_check_details
*
* @param purchaseCheckDetails 新购验收任务详细purchase_check_details
* @param purchaseCheckDetailsList 新购验收任务详细purchase_check_details
* @return 结果
*/
@Override
public int insertPurchaseCheckDetails(PurchaseCheckDetails purchaseCheckDetails)
public int insertPurchaseCheckDetails(List<PurchaseCheckDetails> purchaseCheckDetailsList)
{
purchaseCheckDetails.setCreateTime(DateUtils.getNowDate());
return purchaseCheckDetailsMapper.insertPurchaseCheckDetails(purchaseCheckDetails);
// purchaseCheckDetails.setCreateTime(DateUtils.getNowDate());
// return purchaseCheckDetailsMapper.insertPurchaseCheckDetails(purchaseCheckDetails);
return purchaseCheckDetailsMapper.insertPurchaseCheckDetailsList(purchaseCheckDetailsList);
}
/**

20
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseCheckInfoServiceImpl.java
View File

@ -5,9 +5,11 @@ import java.util.List;
import com.bonus.sgzb.material.domain.PurchaseCheckInfo;
import com.bonus.sgzb.material.domain.TmTask;
import com.bonus.sgzb.material.mapper.PurchaseCheckInfoMapper;
import com.bonus.sgzb.material.mapper.TmTaskMapper;
import com.bonus.sgzb.material.service.IPurchaseCheckInfoService;
import com.bonus.sgzb.common.core.utils.DateUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
@ -23,6 +25,9 @@ public class PurchaseCheckInfoServiceImpl implements IPurchaseCheckInfoService
@Resource
private PurchaseCheckInfoMapper purchaseCheckInfoMapper;
@Resource
private TmTaskMapper taskMapper;
/**
* 查询新购验收任务
*
@ -44,7 +49,12 @@ public class PurchaseCheckInfoServiceImpl implements IPurchaseCheckInfoService
@Override
public List<PurchaseCheckInfo> selectPurchaseCheckInfoList(PurchaseCheckInfo purchaseCheckInfo)
{
return purchaseCheckInfoMapper.selectPurchaseCheckInfoList(purchaseCheckInfo);
List<PurchaseCheckInfo> purchaseCheckInfos = purchaseCheckInfoMapper.selectPurchaseCheckInfoList(purchaseCheckInfo);
for (PurchaseCheckInfo checkInfo : purchaseCheckInfos) {
String typeName = purchaseCheckInfoMapper.selectTypeNameByTaskId(checkInfo.getTaskId());
checkInfo.setPurchasingTypeName(typeName);
}
return purchaseCheckInfos;
}
/**
@ -54,10 +64,16 @@ public class PurchaseCheckInfoServiceImpl implements IPurchaseCheckInfoService
* @return 结果
*/
@Override
@Transactional
public int insertPurchaseCheckInfo(PurchaseCheckInfo purchaseCheckInfo)
{
TmTask task = new TmTask();
task.setTaskType(14L);
task.setTaskStatus(24L);
task.setCode(purchaseCheckInfo.getCode());
task.setCompanyId(purchaseCheckInfo.getCompanyId());
taskMapper.insertTmTask(task);
purchaseCheckInfo.setTaskId(task.getTaskId());
purchaseCheckInfo.setCreateTime(DateUtils.getNowDate());
return purchaseCheckInfoMapper.insertPurchaseCheckInfo(purchaseCheckInfo);
}

96
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/TmTaskServiceImpl.java Normal file
View File

@ -0,0 +1,96 @@
package com.bonus.sgzb.material.service.impl;
import java.util.List;
import com.bonus.sgzb.common.core.utils.DateUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.bonus.sgzb.material.mapper.TmTaskMapper;
import com.bonus.sgzb.material.domain.TmTask;
import com.bonus.sgzb.material.service.ITmTaskService;
/**
* 任务tm_taskService业务层处理
*
* @author bonus
* @date 2023-12-13
*/
@Service
public class TmTaskServiceImpl implements ITmTaskService
{
@Autowired
private TmTaskMapper tmTaskMapper;
/**
* 查询任务tm_task
*
* @param taskId 任务tm_task主键
* @return 任务tm_task
*/
@Override
public TmTask selectTmTaskByTaskId(Long taskId)
{
return tmTaskMapper.selectTmTaskByTaskId(taskId);
}
/**
* 查询任务tm_task列表
*
* @param tmTask 任务tm_task
* @return 任务tm_task
*/
@Override
public List<TmTask> selectTmTaskList(TmTask tmTask)
{
return tmTaskMapper.selectTmTaskList(tmTask);
}
/**
* 新增任务tm_task
*
* @param tmTask 任务tm_task
* @return 结果
*/
@Override
public int insertTmTask(TmTask tmTask)
{
tmTask.setCreateTime(DateUtils.getNowDate());
return tmTaskMapper.insertTmTask(tmTask);
}
/**
* 修改任务tm_task
*
* @param tmTask 任务tm_task
* @return 结果
*/
@Override
public int updateTmTask(TmTask tmTask)
{
tmTask.setUpdateTime(DateUtils.getNowDate());
return tmTaskMapper.updateTmTask(tmTask);
}
/**
* 批量删除任务tm_task
*
* @param taskIds 需要删除的任务tm_task主键
* @return 结果
*/
@Override
public int deleteTmTaskByTaskIds(Long[] taskIds)
{
return tmTaskMapper.deleteTmTaskByTaskIds(taskIds);
}
/**
* 删除任务tm_task信息
*
* @param taskId 任务tm_task主键
* @return 结果
*/
@Override
public int deleteTmTaskByTaskId(Long taskId)
{
return tmTaskMapper.deleteTmTaskByTaskId(taskId);
}
}

62
sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckDetailsMapper.xml
View File

@ -5,6 +5,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<mapper namespace="com.bonus.sgzb.material.mapper.PurchaseCheckDetailsMapper">
<resultMap type="com.bonus.sgzb.material.domain.PurchaseCheckDetails" id="PurchaseCheckDetailsResult">
<result property="id" column="id" />
<result property="taskId" column="task_id" />
<result property="typeId" column="type_id" />
<result property="purchasePrice" column="purchase_price" />
@ -20,18 +21,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<sql id="selectPurchaseCheckDetailsVo">
select task_id, type_id, purchase_price, purchase_num, supplier_id, create_by, production_time, create_time, update_by, update_time, remark, company_id from purchase_check_details
select id,task_id, type_id, purchase_price, purchase_num, supplier_id, create_by, production_time, create_time, update_by, update_time, remark, company_id from purchase_check_details
</sql>
<select id="selectPurchaseCheckDetailsList" parameterType="com.bonus.sgzb.material.domain.PurchaseCheckDetails" resultMap="PurchaseCheckDetailsResult">
<include refid="selectPurchaseCheckDetailsVo"/>
<where>
<if test="typeId != null "> and type_id = #{typeId}</if>
<if test="purchasePrice != null and purchasePrice != ''"> and purchase_price = #{purchasePrice}</if>
<if test="purchaseNum != null "> and purchase_num = #{purchaseNum}</if>
<if test="supplierId != null "> and supplier_id = #{supplierId}</if>
<if test="productionTime != null "> and production_time = #{productionTime}</if>
<if test="companyId != null "> and company_id = #{companyId}</if>
select pcd.id,pcd.task_id, pcd.type_id, pcd.purchase_price, pcd.purchase_num, pcd.supplier_id, msi.supplier, pcd.create_by, pcd.production_time, pcd.create_time,
pcd.update_by, pcd.update_time, pcd.remark, pcd.company_id, mt1.type_name typeName,mt.type_name specificationType
from purchase_check_details pcd
left join ma_type mt on pcd.type_id = mt.type_id
left join ma_type mt1 on mt.parent_id = mt1.type_id
left join ma_supplier_info msi on pcd.supplier_id = msi.supplier_id
<where>
<if test="taskId != null "> and pcd.task_id = #{taskId}</if>
<if test="typeId != null "> and pcd.type_id = #{typeId}</if>
<if test="purchasePrice != null and purchasePrice != ''"> and pcd.purchase_price = #{purchasePrice}</if>
<if test="purchaseNum != null "> and pcd.purchase_num = #{purchaseNum}</if>
<if test="supplierId != null "> and pcd.supplier_id = #{supplierId}</if>
<if test="productionTime != null "> and pcd.production_time = #{productionTime}</if>
<if test="companyId != null "> and pcd.company_id = #{companyId}</if>
</where>
</select>
@ -73,6 +80,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<update id="updatePurchaseCheckDetails" parameterType="com.bonus.sgzb.material.domain.PurchaseCheckDetails">
update purchase_check_details
<trim prefix="SET" suffixOverrides=",">
<if test="taskId != null">task_id = #{taskId},</if>
<if test="typeId != null">type_id = #{typeId},</if>
<if test="purchasePrice != null">purchase_price = #{purchasePrice},</if>
<if test="purchaseNum != null">purchase_num = #{purchaseNum},</if>
@ -85,7 +93,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="remark != null">remark = #{remark},</if>
<if test="companyId != null">company_id = #{companyId},</if>
</trim>
where task_id = #{taskId}
where id = #{id}
</update>
<delete id="deletePurchaseCheckDetailsByTaskId" parameterType="Long">
@ -98,4 +106,38 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{taskId}
</foreach>
</delete>
<insert id="insertPurchaseCheckDetailsList">
<foreach item="checkDetails" collection="purchaseCheckDetailsList" open="" separator=";" close="">
insert into purchase_check_details
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="checkDetails.taskId != null">task_id,</if>
<if test="checkDetails.typeId != null">type_id,</if>
<if test="checkDetails.purchasePrice != null">purchase_price,</if>
<if test="checkDetails.purchaseNum != null">purchase_num,</if>
<if test="checkDetails.supplierId != null">supplier_id,</if>
<if test="checkDetails.createBy != null">create_by,</if>
<if test="checkDetails.productionTime != null">production_time,</if>
<if test="checkDetails.createTime != null">create_time,</if>
<if test="checkDetails.updateBy != null">update_by,</if>
<if test="checkDetails.updateTime != null">update_time,</if>
<if test="checkDetails.remark != null">remark,</if>
<if test="checkDetails.companyId != null">company_id,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="checkDetails.taskId != null">#{checkDetails.taskId},</if>
<if test="checkDetails.typeId != null">#{checkDetails.typeId},</if>
<if test="checkDetails.purchasePrice != null">#{checkDetails.purchasePrice},</if>
<if test="checkDetails.purchaseNum != null">#{checkDetails.purchaseNum},</if>
<if test="checkDetails.supplierId != null">#{checkDetails.supplierId},</if>
<if test="checkDetails.createBy != null">#{checkDetails.createBy},</if>
<if test="checkDetails.productionTime != null">#{checkDetails.productionTime},</if>
<if test="checkDetails.createTime != null">#{checkDetails.createTime},</if>
<if test="checkDetails.updateBy != null">#{checkDetails.updateBy},</if>
<if test="checkDetails.updateTime != null">#{checkDetails.updateTime},</if>
<if test="checkDetails.remark != null">#{checkDetails.remark},</if>
<if test="checkDetails.companyId != null">#{checkDetails.companyId},</if>
</trim>
</foreach>
</insert>
</mapper>

27
sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckInfoMapper.xml
View File

@ -22,12 +22,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</sql>
<select id="selectPurchaseCheckInfoList" parameterType="com.bonus.sgzb.material.domain.PurchaseCheckInfo" resultMap="PurchaseCheckInfoResult">
<include refid="selectPurchaseCheckInfoVo"/>
select pci.task_id, pci.purchase_time, pci.arrival_time, pci.purchaser, pci.create_by, pci.create_time, pci.update_by,
pci.update_time, pci.remark, pci.company_id ,dict.name purchasingStatus,tk.code
from purchase_check_info pci
left join tm_task tk on pci.task_id = tk.task_id
left join (select id,name from sys_dic where p_id = 23) dict on tk.task_status = dict.id
<where>
<if test="purchaseTime != null and purchaseTime != ''"> and purchase_time = #{purchaseTime}</if>
<if test="arrivalTime != null and arrivalTime != ''"> and arrival_time = #{arrivalTime}</if>
<if test="purchaser != null "> and purchaser = #{purchaser}</if>
<if test="companyId != null "> and company_id = #{companyId}</if>
<if test="purchaseTime != null and purchaseTime != ''"> and pci.purchase_time = #{purchaseTime}</if>
<if test="arrivalTime != null and arrivalTime != ''"> and pci.arrival_time = #{arrivalTime}</if>
<if test="purchaser != null "> and pci.purchaser = #{purchaser}</if>
<if test="companyId != null "> and pci.company_id = #{companyId}</if>
</where>
</select>
@ -39,6 +43,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<insert id="insertPurchaseCheckInfo" parameterType="com.bonus.sgzb.material.domain.PurchaseCheckInfo" useGeneratedKeys="true" keyProperty="taskId">
insert into purchase_check_info
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="taskId != null">task_id,</if>
<if test="purchaseTime != null and purchaseTime != ''">purchase_time,</if>
<if test="arrivalTime != null">arrival_time,</if>
<if test="purchaser != null">purchaser,</if>
@ -50,6 +55,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="companyId != null">company_id,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="taskId != null">#{taskId},</if>
<if test="purchaseTime != null and purchaseTime != ''">#{purchaseTime},</if>
<if test="arrivalTime != null">#{arrivalTime},</if>
<if test="purchaser != null">#{purchaser},</if>
@ -88,4 +94,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{taskId}
</foreach>
</delete>
<select id="selectTypeNameByTaskId" resultType="java.lang.String">
select GROUP_CONCAT(type_name) typeName from
(select distinct pcd.task_id, mt1.type_name
from purchase_check_details pcd
left join ma_type mt on pcd.type_id = mt.type_id
left join ma_type mt1 on mt.parent_id = mt1.type_id
where pcd.task_id = #{taskId}
) t
GROUP BY task_id
</select>
</mapper>

91
sgzb-modules/sgzb-material/src/main/resources/mapper/material/TmTaskMapper.xml Normal file
View File

@ -0,0 +1,91 @@
<?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="com.bonus.sgzb.material.mapper.TmTaskMapper">
<resultMap type="com.bonus.sgzb.material.domain.TmTask" id="TmTaskResult">
<result property="taskId" column="task_id" />
<result property="taskType" column="task_type" />
<result property="taskStatus" column="task_status" />
<result property="code" column="code" />
<result property="createBy" column="create_by" />
<result property="createTime" column="create_time" />
<result property="updateBy" column="update_by" />
<result property="updateTime" column="update_time" />
<result property="remark" column="remark" />
<result property="companyId" column="company_id" />
</resultMap>
<sql id="selectTmTaskVo">
select task_id, task_type, task_status, code, create_by, create_time, update_by, update_time, remark, company_id from tm_task
</sql>
<select id="selectTmTaskList" parameterType="com.bonus.sgzb.material.domain.TmTask" resultMap="TmTaskResult">
<include refid="selectTmTaskVo"/>
<where>
<if test="taskType != null "> and task_type = #{taskType}</if>
<if test="taskStatus != null "> and task_status = #{taskStatus}</if>
<if test="code != null and code != ''"> and code = #{code}</if>
<if test="companyId != null "> and company_id = #{companyId}</if>
</where>
</select>
<select id="selectTmTaskByTaskId" parameterType="Long" resultMap="TmTaskResult">
<include refid="selectTmTaskVo"/>
where task_id = #{taskId}
</select>
<insert id="insertTmTask" parameterType="com.bonus.sgzb.material.domain.TmTask" useGeneratedKeys="true" keyProperty="taskId">
insert into tm_task
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="taskType != null">task_type,</if>
<if test="taskStatus != null">task_status,</if>
<if test="code != null">code,</if>
<if test="createBy != null">create_by,</if>
<if test="createTime != null">create_time,</if>
<if test="updateBy != null">update_by,</if>
<if test="updateTime != null">update_time,</if>
<if test="remark != null">remark,</if>
<if test="companyId != null">company_id,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="taskType != null">#{taskType},</if>
<if test="taskStatus != null">#{taskStatus},</if>
<if test="code != null">#{code},</if>
<if test="createBy != null">#{createBy},</if>
<if test="createTime != null">#{createTime},</if>
<if test="updateBy != null">#{updateBy},</if>
<if test="updateTime != null">#{updateTime},</if>
<if test="remark != null">#{remark},</if>
<if test="companyId != null">#{companyId},</if>
</trim>
</insert>
<update id="updateTmTask" parameterType="com.bonus.sgzb.material.domain.TmTask">
update tm_task
<trim prefix="SET" suffixOverrides=",">
<if test="taskType != null">task_type = #{taskType},</if>
<if test="taskStatus != null">task_status = #{taskStatus},</if>
<if test="code != null">code = #{code},</if>
<if test="createBy != null">create_by = #{createBy},</if>
<if test="createTime != null">create_time = #{createTime},</if>
<if test="updateBy != null">update_by = #{updateBy},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
<if test="remark != null">remark = #{remark},</if>
<if test="companyId != null">company_id = #{companyId},</if>
</trim>
where task_id = #{taskId}
</update>
<delete id="deleteTmTaskByTaskId" parameterType="Long">
delete from tm_task where task_id = #{taskId}
</delete>
<delete id="deleteTmTaskByTaskIds" parameterType="String">
delete from tm_task where task_id in
<foreach item="taskId" collection="array" open="(" separator="," close=")">
#{taskId}
</foreach>
</delete>
</mapper>