diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/PurchaseInputController.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/PurchaseInputController.java index 339574fd..f4ff8589 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/PurchaseInputController.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/PurchaseInputController.java @@ -59,7 +59,7 @@ public class PurchaseInputController extends BaseController { } /** - * 修改新购验收编号管理,暂时不用 + * 审核 */ @ApiOperation(value = "修改编码管理的入库状态") @PostMapping("/manageStatus") diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/PurchaseInputMapper.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/PurchaseInputMapper.java index e1a10a85..af236715 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/PurchaseInputMapper.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/PurchaseInputMapper.java @@ -119,4 +119,16 @@ public interface PurchaseInputMapper { * @return 结果 */ int updateTmTask(TmTask task); + /** + * 判断是否全部已操作（不通过或通过） + * @param taskId + * @return int + */ + int isOperateAll(Long taskId); + /** + * 是否为全部不通过 + * @param taskId + * @return + */ + int selectPurchaseCheckDetailsStatus(Long taskId); } \ No newline at end of file diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/PurchaseInputServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/PurchaseInputServiceImpl.java index 1d3151c3..02ce3364 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/PurchaseInputServiceImpl.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/PurchaseInputServiceImpl.java @@ -90,16 +90,37 @@ public class PurchaseInputServiceImpl implements PurchaseInputService { // 新增入库记录 purchaseInputMapper.insertMaInputRecord(maInputRecord); } - // 当全部为已入库的时候任务改为入库状态 - Integer count = purchaseInputMapper.selectMacodeInfoStatusByTaskId(taskId); - if (count <= 0) { - TmTask task = new TmTask(); - task.setTaskId(taskId); - task.setTaskStatus(28); - task.setUpdateBy(String.valueOf(SecurityUtils.getLoginUser().getUserid())); - task.setUpdateTime(DateUtils.getNowDate()); - purchaseInputMapper.updateTmTask(task); + //判断是否全部已操作（通过或不通过） + int count=purchaseInputMapper.isOperateAll(taskId); + if (count<=0){ + //是否为全部不通过 + int count1 = purchaseInputMapper.selectPurchaseCheckDetailsStatus(taskId); + if (count1>0){ + TmTask task = new TmTask(); + task.setTaskId(taskId); + task.setTaskStatus(28); + task.setUpdateBy(String.valueOf(SecurityUtils.getLoginUser().getUserid())); + task.setUpdateTime(DateUtils.getNowDate()); + purchaseInputMapper.updateTmTask(task); + }else { + TmTask task = new TmTask(); + task.setTaskId(taskId); + task.setTaskStatus(107); + task.setUpdateBy(String.valueOf(SecurityUtils.getLoginUser().getUserid())); + task.setUpdateTime(DateUtils.getNowDate()); + purchaseInputMapper.updateTmTask(task); + } } +// // 当全部为已入库的时候任务改为入库状态 +// Integer count = purchaseInputMapper.selectMacodeInfoStatusByTaskId(taskId); +// if (count <= 0) { +// TmTask task = new TmTask(); +// task.setTaskId(taskId); +// task.setTaskStatus(28); +// task.setUpdateBy(String.valueOf(SecurityUtils.getLoginUser().getUserid())); +// task.setUpdateTime(DateUtils.getNowDate()); +// purchaseInputMapper.updateTmTask(task); +// } return 1; } } diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/RepairServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/RepairServiceImpl.java index 2ea1e3b1..ecffe4b6 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/RepairServiceImpl.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/RepairServiceImpl.java @@ -8,6 +8,7 @@ import com.bonus.sgzb.base.domain.vo.DictVo; import com.bonus.sgzb.base.mapper.RepairMapper; import com.bonus.sgzb.base.service.RepairService; import com.bonus.sgzb.common.core.exception.ServiceException; +import com.bonus.sgzb.common.core.utils.StringUtils; import com.bonus.sgzb.common.core.web.domain.AjaxResult; import com.bonus.sgzb.common.security.utils.SecurityUtils; import com.bonus.sgzb.system.api.domain.SysUser; @@ -131,19 +132,25 @@ public class RepairServiceImpl implements RepairService { } for (RepairPartDetails partDetails : partList){ if (sfPart.equals(partDetails.getPartType())){ + if (StringUtils.isEmpty(partDetails.getPartCost())){ + partDetails.setPartCost("0"); + } BigDecimal partCost = new BigDecimal(partDetails.getPartCost()); sfCosts = sfCosts.add(partCost); } else if (bsfPart.equals(partDetails.getPartType())) { + if (StringUtils.isEmpty(partDetails.getPartCost())){ + partDetails.setPartCost("0"); + } BigDecimal partCost = new BigDecimal(partDetails.getPartCost()); bsfCosts = bsfCosts.add(partCost); } else{ throw new ServiceException("请选择配件收费类型"); } } - if (!sfCosts.toString().equals("0")){ + if (!"0".equals(sfCosts.toString())){ mapper.addRepairCost(bean,sfCosts,sfPart); } - if (!bsfCosts.toString().equals("0")){ + if (!"0".equals(bsfCosts.toString())){ mapper.addRepairCost(bean,bsfCosts,bsfPart); } } diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/PurchaseInputMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/PurchaseInputMapper.xml index 78dcd88d..cc48414f 100644 --- a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/PurchaseInputMapper.xml +++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/PurchaseInputMapper.xml @@ -164,4 +164,20 @@ + + \ No newline at end of file diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/PurchaseCheckDetailsController.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/PurchaseCheckDetailsController.java index 018d1092..39abd080 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/PurchaseCheckDetailsController.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/PurchaseCheckDetailsController.java @@ -85,10 +85,11 @@ public class PurchaseCheckDetailsController extends BaseController } /** - * 修改新购验收任务详细 + * 验收审核 + * 通过/不通过 */ - @ApiOperation(value = "修改新购验收任务详细") - @Log(title = "修改新购验收任务详细", businessType = BusinessType.UPDATE) + @ApiOperation(value = "验收审核") + @Log(title = "验收审核", businessType = BusinessType.UPDATE) @PutMapping public AjaxResult edit(@RequestBody List purchaseCheckDetailsList) { diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/PurchaseCheckServiceCenterController.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/PurchaseCheckServiceCenterController.java index 3e263aea..ee66601b 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/PurchaseCheckServiceCenterController.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/PurchaseCheckServiceCenterController.java @@ -69,9 +69,9 @@ public class PurchaseCheckServiceCenterController extends BaseController } /** - * 修改新购验收编号管理,暂时不用 + * 审核-通过/不通过 */ - @ApiOperation(value = "修改编码管理的入库状态") + @ApiOperation(value = "综合服务中心审核") @PutMapping("/manageStatus") public AjaxResult modifyManageStatus(@RequestBody MaInputVO maInputVO) throws Exception { return toAjax(purchaseCheckServiceCenterService.modifyManageStatus(maInputVO)); diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/PurchaseMacodeInfoController.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/PurchaseMacodeInfoController.java index 19bc5c34..12566f2f 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/PurchaseMacodeInfoController.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/PurchaseMacodeInfoController.java @@ -103,9 +103,10 @@ public class PurchaseMacodeInfoController extends BaseController { } /** - * 修改新购验收编号管理,暂时不用 + * 新购入库审核 + * 通过/不通过 */ - @ApiOperation(value = "修改编码管理的入库状态") + @ApiOperation(value = "新购入库审核") @PutMapping("/manageStatus") public AjaxResult modifyManageStatus(@RequestBody MaInputVO maInputVO) throws Exception { return toAjax(purchaseMacodeInfoService.modifyManageStatus(maInputVO)); diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/PurchaseMacodeInfoMapper.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/PurchaseMacodeInfoMapper.java index b1c3fa4c..44f617af 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/PurchaseMacodeInfoMapper.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/PurchaseMacodeInfoMapper.java @@ -264,4 +264,17 @@ public interface PurchaseMacodeInfoMapper { List warehousingEntry(PurchaseMacodeInfo purchaseMacodeInfo); List selectPutinDetailsAddTypeId(PurchaseMacodeInfo purchaseMacodeInfo); + + /** + * 判断是否全部已操作（不通过或通过） + * @param taskId + * @return int + */ + int isOperateAll(Long taskId); + /** + * 是否为全部不通过 + * @param taskId + * @return + */ + int selectPurchaseCheckDetailsStatus(Long taskId); } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/IPurchaseCheckDetailsService.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/IPurchaseCheckDetailsService.java index 6467b799..94f87b25 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/IPurchaseCheckDetailsService.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/IPurchaseCheckDetailsService.java @@ -37,9 +37,9 @@ public interface IPurchaseCheckDetailsService public int insertPurchaseCheckDetails(List purchaseCheckDetailsList); /** - * 修改新购验收任务详细purchase_check_details + * 验收审核 * - * @param purchaseCheckDetailsList 新购验收任务详细purchase_check_details + * @param purchaseCheckDetailsList * @return 结果 */ public int updatePurchaseCheckDetails(List purchaseCheckDetailsList); diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/IPurchaseMacodeInfoService.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/IPurchaseMacodeInfoService.java index 35e375cf..1faf8175 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/IPurchaseMacodeInfoService.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/IPurchaseMacodeInfoService.java @@ -79,7 +79,7 @@ public interface IPurchaseMacodeInfoService */ int deletePurchaseMacodeInfoById(Long id); /** - * 修改编码管理的入库状态 + * 新购入库审核 通过/不通过 * @param maInputVO * @return */ diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/PurchaseCheckServiceCenterService.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/PurchaseCheckServiceCenterService.java index 5f2eab36..cff0f674 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/PurchaseCheckServiceCenterService.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/PurchaseCheckServiceCenterService.java @@ -110,7 +110,8 @@ public interface PurchaseCheckServiceCenterService List selectPutinDetails(PurchaseMacodeInfo purchaseMacodeInfo); /** - * 修改编码管理的入库状态 + * 综合服务中心审核 + * 审核-通过/不通过 * @param maInputVO * @return */ diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseCheckDetailsServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseCheckDetailsServiceImpl.java index 8a2a929d..5b04b893 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseCheckDetailsServiceImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseCheckDetailsServiceImpl.java @@ -65,10 +65,8 @@ public class PurchaseCheckDetailsServiceImpl implements IPurchaseCheckDetailsSer } /** - * 修改新购验收任务详细purchase_check_details - * - * @param purchaseCheckDetailsList 新购验收任务详细purchase_check_details - * @return 结果 + * 验收审核 + * 通过/不通过 */ @Override @Transactional(rollbackFor = Exception.class) diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseMacodeInfoServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseMacodeInfoServiceImpl.java index 2a4aae2f..0fe434e2 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseMacodeInfoServiceImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseMacodeInfoServiceImpl.java @@ -18,6 +18,7 @@ import com.bonus.sgzb.common.core.utils.DateUtils; import com.bonus.sgzb.material.vo.EquipmentNumberVO; import com.bonus.sgzb.material.vo.GlobalContants; import com.bonus.sgzb.material.vo.MaInputVO; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -45,6 +46,7 @@ public class PurchaseMacodeInfoServiceImpl implements IPurchaseMacodeInfoService private PurchaseCheckDetailsMapper checkDetailsMapper; + /** * 查询新购验收编号管理 * @@ -261,10 +263,8 @@ public class PurchaseMacodeInfoServiceImpl implements IPurchaseMacodeInfoService } /** - * 修改编码管理的入库状态,暂时不用 - * - * @param maInputVO 入库信息 - * @return 结果 + * 新购入库审核 + * 通过/不通过 */ @Override public int modifyManageStatus(MaInputVO maInputVO) { @@ -337,20 +337,45 @@ public class PurchaseMacodeInfoServiceImpl implements IPurchaseMacodeInfoService } } - // 当全部审核的时候任务改为入库状态 - Integer count = purchaseMacodeInfoMapper.selectMacodeInfoStatusByTaskId(taskId); - if (count <= 0) { - TmTask task = new TmTask(); - task.setTaskId(taskId); - task.setTaskStatus(28); - task.setUpdateBy(String.valueOf(SecurityUtils.getLoginUser().getUserid())); - task.setUpdateTime(DateUtils.getNowDate()); - taskMapper.updateTmTask(task); + //判断是否全部已操作（通过或不通过） + int count=purchaseMacodeInfoMapper.isOperateAll(taskId); + if (count<=0){ + //是否为全部不通过 + int count1 = purchaseMacodeInfoMapper.selectPurchaseCheckDetailsStatus(taskId); + if (count1>0){ + TmTask task = new TmTask(); + task.setTaskId(taskId); + task.setTaskStatus(28); + task.setUpdateBy(String.valueOf(SecurityUtils.getLoginUser().getUserid())); + task.setUpdateTime(DateUtils.getNowDate()); + taskMapper.updateTmTask(task); + }else { + TmTask task = new TmTask(); + task.setTaskId(taskId); + task.setTaskStatus(107); + task.setUpdateBy(String.valueOf(SecurityUtils.getLoginUser().getUserid())); + task.setUpdateTime(DateUtils.getNowDate()); + taskMapper.updateTmTask(task); + } } +// // 当全部审核的时候任务改为入库状态 +// Integer count = purchaseMacodeInfoMapper.selectMacodeInfoStatusByTaskId(taskId); +// if (count <= 0) { +// TmTask task = new TmTask(); +// task.setTaskId(taskId); +// task.setTaskStatus(28); +// task.setUpdateBy(String.valueOf(SecurityUtils.getLoginUser().getUserid())); +// task.setUpdateTime(DateUtils.getNowDate()); +// taskMapper.updateTmTask(task); +// } return 1; } + private List selectPutinDetailsAddTypeId(PurchaseMacodeInfo purchaseMacodeInfo) { + return purchaseMacodeInfoMapper.selectPutinDetailsAddTypeId(purchaseMacodeInfo); + } + /** * 根据机具编码删除编码 diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckDetailsMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckDetailsMapper.xml index b801411a..95caa111 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckDetailsMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckDetailsMapper.xml @@ -44,8 +44,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" left join tm_task tk on pcd.task_id = tk.task_id where 1=1 and pcd.task_id = #{taskId} - and (mt.type_name like concat('%',#{keyWord},'%') - or mt1.type_name like concat('%',#{keyWord}) or msi.supplier like concat('%',#{keyWord})) + + and (mt.type_name like concat('%',#{keyWord},'%') + or mt1.type_name like concat('%',#{keyWord},'%') or msi.supplier like concat('%',#{keyWord},'%')) and pcd.type_id = #{typeId} and pcd.purchase_price = #{purchasePrice} diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckInfoMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckInfoMapper.xml index f73bc80c..a6661ac1 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckInfoMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckInfoMapper.xml @@ -184,7 +184,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" left join (select id,name from sys_dic where p_id = 50) dict on tk.task_status = dict.id left join sys_user su on pci.purchaser = su.user_id LEFT JOIN sys_user us on us.user_id = tk.update_by - where task_type = 23 and tk.task_status in (26,28) + where task_type = 23 and tk.task_status in (26,28,107) and tk.code like concat('%',#{keyWord},'%') and pci.purchase_time = #{purchaseTime} and pci.arrival_time = #{arrivalTime} @@ -273,7 +273,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" left join (select id,name from sys_dic where p_id = 50) dict on tk.task_status = dict.id left join sys_user su on pci.purchaser = su.user_id LEFT JOIN sys_user us on us.user_id = tk.update_by - where task_type = 23 and tk.task_status in (105,28) + where task_type = 23 and tk.task_status in (105,28,107) and tk.code like concat('%',#{keyWord},'%') and pci.purchase_time = #{purchaseTime} and pci.arrival_time = #{arrivalTime} diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckServiceCenterMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckServiceCenterMapper.xml index f98e7013..f999f385 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckServiceCenterMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckServiceCenterMapper.xml @@ -276,7 +276,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" left join sys_user su on pci.purchaser = su.user_id LEFT JOIN sys_user us on us.user_id = tk.update_by LEFT JOIN purchase_check_details pcd on pcd.task_id=pci.task_id - where task_type = 23 and tk.task_status in (26,28,105,106) + where task_type = 23 and tk.task_status in (26,28,105,106,107) and (tk.code like concat('%',#{keyWord},'%') or su.user_name like concat('%',#{keyWord},'%') @@ -426,7 +426,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" FROM purchase_check_details WHERE - task_id = #{taskId} and status != 6 and status!=7 + task_id = #{taskId} and status =1 + + update ma_type set num = #{num} where type_id = #{typeId} diff --git a/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/domain/PurchaseNoticePerson.java b/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/domain/PurchaseNoticePerson.java index a1ed164b..bcea2907 100644 --- a/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/domain/PurchaseNoticePerson.java +++ b/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/domain/PurchaseNoticePerson.java @@ -22,6 +22,14 @@ public class PurchaseNoticePerson extends BaseEntity @ApiModelProperty(value = "用户id") private Long userId; + /** 部门id */ + @ApiModelProperty(value = "用户id") + private Long deptId; + + /** 用户昵称 */ + @ApiModelProperty(value = "用户昵称") + private String nickName; + /** 用户名称 */ @ApiModelProperty(value = "用户名称") private String userName; @@ -103,6 +111,22 @@ public class PurchaseNoticePerson extends BaseEntity this.roleId = roleId; } + public Long getDeptId() { + return deptId; + } + + public void setDeptId(Long deptId) { + this.deptId = deptId; + } + + public String getNickName() { + return nickName; + } + + public void setNickName(String nickName) { + this.nickName = nickName; + } + @Override public String toString() { return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) diff --git a/sgzb-modules/sgzb-system/src/main/resources/mapper/system/PurchaseNoticePersonMapper.xml b/sgzb-modules/sgzb-system/src/main/resources/mapper/system/PurchaseNoticePersonMapper.xml index 7055873e..b743ee17 100644 --- a/sgzb-modules/sgzb-system/src/main/resources/mapper/system/PurchaseNoticePersonMapper.xml +++ b/sgzb-modules/sgzb-system/src/main/resources/mapper/system/PurchaseNoticePersonMapper.xml @@ -9,6 +9,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -16,16 +17,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" diff --git a/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesServiceCenterList.vue b/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesServiceCenterList.vue index 1ece5d84..311785fa 100644 --- a/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesServiceCenterList.vue +++ b/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesServiceCenterList.vue @@ -74,6 +74,7 @@ 入库待审核 已驳回 已入库 + 入库驳回