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

Merge branch 'dev' of http://192.168.0.56:3000/bonus/devicesmgt into dev

This commit is contained in:
zhouzy062 2024-03-26 11:29:14 +08:00
parent 54c25d1997 f64ebf1aea
commit a78e50c8b3
50 changed files with 805 additions and 429 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/LeaseOutDetails.java
View File

@ -25,9 +25,25 @@ public class LeaseOutDetails implements Serializable {
@ApiModelProperty(value = "id")
private Integer id;
/** 父级ID */
@ApiModelProperty(value = "父级ID")
private Integer parentId;
/** 任务ID */
@ApiModelProperty(value = "任务ID")
private Integer parentId;
private Integer taskId;
/** 任务编码 */
@ApiModelProperty(value = "任务编码")
private String code;
/** 单位名称 */
@ApiModelProperty(value = "单位名称")
private String unitName;
/** 工程名称 */
@ApiModelProperty(value = "工程名称")
private String proName;
/** 规格ID */
@ApiModelProperty(value = "规格ID")
@ -49,8 +65,16 @@ public class LeaseOutDetails implements Serializable {
@ApiModelProperty(value = "协议ID")
private String agreementId;
/** 预领料数 */
@ApiModelProperty(value = "预领料数")
/** 预领数量 */
@ApiModelProperty(value = "预领数量")
private Double preNum;
/** 审批数量 */
@ApiModelProperty(value = "审批数量")
private Double auditNum;
/** 出库数量 */
@ApiModelProperty(value = "出库数量")
private Double outNum;
/** 出库类型 */
@ -78,7 +102,9 @@ public class LeaseOutDetails implements Serializable {
/** 备注 */
@ApiModelProperty(value = "备注")
private String remark;
/** 车牌号 */
@ApiModelProperty(value = "车牌号")
private String carCode;
/** 数据所属组织 */

13
sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/MaType.java
View File

@ -1,5 +1,6 @@
package com.bonus.sgzb.base.api.domain;
import com.bonus.sgzb.common.core.annotation.Excel;
import com.bonus.sgzb.common.core.web.domain.BaseEntity;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonInclude;
@ -30,6 +31,7 @@ public class MaType extends BaseEntity {
/** 类型名称 */
@ApiModelProperty(value = "类型名称")
@Excel(name = "名称")
private String typeName;
/** 类型ID */
@ -58,6 +60,7 @@ public class MaType extends BaseEntity {
/** 计量单位 */
@ApiModelProperty(value = "计量单位")
@Excel(name = "计量单位")
private String unitName;
/** 管理方式 */
@ -66,6 +69,7 @@ public class MaType extends BaseEntity {
/** 租赁单价 */
@ApiModelProperty(value = "租赁单价")
@Excel(name = "租赁价格")
private String leasePrice;
/** 租赁单价 */
@ -79,10 +83,12 @@ public class MaType extends BaseEntity {
/** 原价 */
@ApiModelProperty(value = "原价")
@Excel(name = "原值")
private String buyPrice;
/** 丢失赔偿价 */
@ApiModelProperty(value = "丢失赔偿价")
@ApiModelProperty(value = "丢失|赔偿价")
@Excel(name = "丢失赔偿价")
private String payPrice;
/** 层级 */
@ -137,6 +143,7 @@ public class MaType extends BaseEntity {
/** 备注 */
@ApiModelProperty(value = "备注")
@Excel(name = "备注信息")
private String remark;
/** 数据所属组织 */
@ -145,6 +152,7 @@ public class MaType extends BaseEntity {
/** 图片名称 */
@ApiModelProperty(value = "图片名称")
@Excel(name = "图片")
private String photoName;
/** 图片路径 */
@ -154,6 +162,7 @@ public class MaType extends BaseEntity {
/** 文档名称 */
@ApiModelProperty(value = "文档名称")
@Excel(name = "文档资料")
private String documentName;
/** 文档路径 */
@ -166,6 +175,7 @@ public class MaType extends BaseEntity {
/** 库管员名称 */
@ApiModelProperty(value = "库管员名称")
@Excel(name = "库管员")
private String keeperUserName;
/** 库管员id */
@ -182,6 +192,7 @@ public class MaType extends BaseEntity {
/** 资产属性名称 */
@ApiModelProperty(value = "资产属性名称")
@Excel(name = "资产属性")
private String propName;
/** 资产属性名称 */

123
sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/SysDic.java
View File

@ -11,137 +11,138 @@ import org.apache.commons.lang3.builder.ToStringStyle;
* @author bonus
* @date 2023-12-11
*/
public class SysDic extends BaseEntity
{
public class SysDic extends BaseEntity {
private static final long serialVersionUID = 1L;
/** $column.columnComment */
/**
* $column.columnComment
*/
private Long id;
/** 父id */
@Excel(name = "父id")
/**
* 父id
*/
private Long pId;
/** 编码 */
@Excel(name = "编码")
/**
* 编码
*/
private String code;
/** 字典名称 */
@Excel(name = "字典名称")
/**
* 字典名称
*/
@Excel(name = "单位类型")
private String name;
/** 描述 */
@Excel(name = "描述")
/**
* 描述
*/
private String description;
/** 值 */
@Excel(name = "值")
/**
* 值
*/
private String value;
/** 排序 */
@Excel(name = "排序")
/**
* 排序
*/
private String sort;
/** 层级 */
@Excel(name = "层级")
/**
* 层级
*/
private String level;
/** 状态 */
@Excel(name = "状态")
/**
* 状态
*/
@Excel(name = "状态", readConverterExp = "0=启用,1=不启用,2=删除")
private String status;
/** 创建人 */
@Excel(name = "创建人")
/**
* 创建人
*/
private String creator;
public void setId(Long id)
{
public void setId(Long id) {
this.id = id;
}
public Long getId()
{
public Long getId() {
return id;
}
public void setpId(Long pId)
{
public void setpId(Long pId) {
this.pId = pId;
}
public Long getpId()
{
public Long getpId() {
return pId;
}
public void setCode(String code)
{
public void setCode(String code) {
this.code = code;
}
public String getCode()
{
public String getCode() {
return code;
}
public void setName(String name)
{
public void setName(String name) {
this.name = name;
}
public String getName()
{
public String getName() {
return name;
}
public void setDescription(String description)
{
public void setDescription(String description) {
this.description = description;
}
public String getDescription()
{
public String getDescription() {
return description;
}
public void setValue(String value)
{
public void setValue(String value) {
this.value = value;
}
public String getValue()
{
public String getValue() {
return value;
}
public void setSort(String sort)
{
public void setSort(String sort) {
this.sort = sort;
}
public String getSort()
{
public String getSort() {
return sort;
}
public void setLevel(String level)
{
public void setLevel(String level) {
this.level = level;
}
public String getLevel()
{
public String getLevel() {
return level;
}
public void setStatus(String status)
{
public void setStatus(String status) {
this.status = status;
}
public String getStatus()
{
public String getStatus() {
return status;
}
public void setCreator(String creator)
{
public void setCreator(String creator) {
this.creator = creator;
}
public String getCreator()
{
public String getCreator() {
return creator;
}

2
sgzb-common/sgzb-common-core/src/main/java/com/bonus/sgzb/common/core/utils/StringHelper.java
View File

@ -15,7 +15,7 @@ import java.util.regex.Pattern;
*/
public class StringHelper {
private static String hexString = "0123456789ABCDEF";
private static final String hexString = "0123456789ABCDEF";
public static String replaceAll(String str, String oldStr, String newStr) {
return str.replaceAll(oldStr, newStr);

8
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/LeaseOutDetailsController.java
View File

@ -1,7 +1,6 @@
package com.bonus.sgzb.app.controller;
import com.bonus.sgzb.app.domain.LeaseApplyDetails;
import com.bonus.sgzb.app.domain.LeaseApplyInfo;
import com.bonus.sgzb.app.service.LeaseOutDetailsService;
import com.bonus.sgzb.base.api.domain.LeaseOutDetails;
import com.bonus.sgzb.base.api.domain.MaMachine;
@ -11,7 +10,6 @@ import com.bonus.sgzb.common.core.web.page.TableDataInfo;
import com.bonus.sgzb.common.log.annotation.Log;
import com.bonus.sgzb.common.log.enums.BusinessType;
import io.swagger.annotations.ApiOperation;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@ -37,6 +35,12 @@ public class LeaseOutDetailsController extends BaseController {
return getDataTable(leaseOutDetailsService.selectListByParentId(taskId));
}
@Log(title = "领料出库列表", businessType = BusinessType.QUERY)
@GetMapping("/getLeaseOutRecordList")
public TableDataInfo getLeaseList(@RequestBody LeaseOutDetails record) {
return getDataTable(leaseOutDetailsService.leaseOutRecordList(record));
}
/**
* 绑定设备
*/

2
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/PurchaseInputController.java
View File

@ -59,7 +59,7 @@ public class PurchaseInputController extends BaseController {
}
/**
* 修改新购验收编号管理,暂时不用
* 审核
*/
@ApiOperation(value = "修改编码管理的入库状态")
@PostMapping("/manageStatus")

1
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/TmTaskController.java
View File

@ -202,6 +202,7 @@ public class TmTaskController extends BaseController {
leaseApplyInfo.setCompanyId(leaseApplyDetailsList.get(0).getCompanyId()); // 设置设备所属分公司,用于交给哪家审核
leaseApplyInfo.setType("2"); // 设置审批层级，先固定2层，后期根据接口传入Type区分来源设定
leaseApplyInfo.setLeaseType(task.getLeaseType());
leaseApplyInfo.setEstimateLeaseTime(task.getEstimateLeaseTime());
// 创建领料任务，返回领料任务编号
boolean addLeaseTaskResult = leaseApplyInfoService.genderLeaseCode(leaseApplyInfo) > 0;

5
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/LeaseApplyInfo.java
View File

@ -162,4 +162,9 @@ public class LeaseApplyInfo implements Serializable {
@ApiModelProperty(value="领用类型：0 短期租赁 1长期领用")
private String leaseType;
@ApiModelProperty(value="预领取时间")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@JSONField(format = "yyyy-MM-dd HH:mm:ss")
private Date estimateLeaseTime;
}

8
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/TmTask.java
View File

@ -1,5 +1,6 @@
package com.bonus.sgzb.app.domain;
import com.alibaba.fastjson2.annotation.JSONField;
import com.bonus.sgzb.common.core.annotation.Excel;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
@ -244,8 +245,9 @@ public class TmTask implements Serializable {
private String manageType;
private String typeId;
@ApiModelProperty(value="预计领料时间（重庆）")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date estimateLeaseTime;
}

10
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/LeaseOutDetailsMapper.java
View File

@ -1,7 +1,6 @@
package com.bonus.sgzb.app.mapper;
import com.bonus.sgzb.app.domain.LeaseApplyDetails;
import com.bonus.sgzb.app.domain.TmTask;
import com.bonus.sgzb.base.api.domain.LeaseOutDetails;
import com.bonus.sgzb.base.api.domain.MaType;
import com.bonus.sgzb.base.api.domain.SltAgreementInfo;
@ -24,6 +23,13 @@ public interface LeaseOutDetailsMapper {
/** 查询出库详情 */
List<LeaseOutDetails> selectListByParentId(String parentId);
/**
* 领料出库列表
* @param bean 参数
* @return 列表
*/
List<LeaseOutDetails> leaseOutRecordList(LeaseOutDetails bean);
/**
* 修改 （lease_apply_details 领料任务详细表）的已领数量
*/
@ -81,4 +87,6 @@ public interface LeaseOutDetailsMapper {
SltAgreementInfo getSltAgreementInfo(LeaseOutDetails record);
int updSltInfo(SltAgreementInfo sltAgreementInfo);
MaType selectByTypeId(@Param("record") LeaseOutDetails record);
}

12
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/PurchaseInputMapper.java
View File

@ -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);
}

8
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/LeaseOutDetailsService.java
View File

@ -1,7 +1,6 @@
package com.bonus.sgzb.app.service;
import com.bonus.sgzb.app.domain.LeaseApplyDetails;
import com.bonus.sgzb.app.domain.TmTask;
import com.bonus.sgzb.base.api.domain.LeaseOutDetails;
import com.bonus.sgzb.base.api.domain.MaMachine;
import com.bonus.sgzb.common.core.web.domain.AjaxResult;
@ -24,6 +23,13 @@ public interface LeaseOutDetailsService {
*/
List<LeaseOutDetails> selectListByParentId(String parentId);
/**
* 领料出库列表
* @param bean 参数
* @return 列表
*/
List<LeaseOutDetails> leaseOutRecordList(LeaseOutDetails bean);
int bindMachineByRfid(MaMachine maMachine);
int bindMachineByQrCode(MaMachine maMachine);

19
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/LeaseOutDetailsServiceImpl.java
View File

@ -16,6 +16,7 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
import java.util.Objects;
@ -51,6 +52,17 @@ public class LeaseOutDetailsServiceImpl implements LeaseOutDetailsService {
return leaseOutDetailsMapper.selectListByParentId(parentId);
}
/**
* 领料出库列表
*
* @param bean 参数
* @return 列表
*/
@Override
public List<LeaseOutDetails> leaseOutRecordList(LeaseOutDetails bean) {
return leaseOutDetailsMapper.leaseOutRecordList(bean);
}
@Override
@Transactional
public int bindMachineByRfid(MaMachine maMachine) {
@ -136,6 +148,13 @@ public class LeaseOutDetailsServiceImpl implements LeaseOutDetailsService {
if (record.getOutNum() == null || record.getOutNum() < outNum) {
record.setOutNum(1.00);
}
//先判断(ma_type 设备规格表)中的库存够不够出库的
MaType maType = leaseOutDetailsMapper.selectByTypeId(record);
if (maType != null) {
if (maType.getNum() == null || maType.getNum().compareTo(BigDecimal.valueOf(record.getOutNum())) < 0) {
return AjaxResult.error("领料出库失败,机具库存不足");
}
}
// 首先更新领料任务详情表的领料数及状态
int updateLeaseApplyDetailsOutNum = leaseOutDetailsMapper.updateLeaseApplyDetailsOutNum(record);
// 插入领料出库明细表

39
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/PurchaseInputServiceImpl.java
View File

@ -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;
}
}

1
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java
View File

@ -992,6 +992,7 @@ public class TmTaskServiceImpl implements TmTaskService {
if (res == 0) {
throw new RuntimeException("insertNewData异常");
}
// 再插入lease apply detail
res = insertNewDetailData(tmTask);
if (res == 0) {
throw new RuntimeException("insertNewDetailData异常");

38
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/BmProjectLotController.java
View File

@ -1,8 +1,10 @@
package com.bonus.sgzb.base.controller;
import com.bonus.sgzb.base.domain.BmProjectInfo;
import com.bonus.sgzb.base.domain.BmProjectLot;
import com.bonus.sgzb.base.service.BmProjectLotService;
import com.bonus.sgzb.common.core.utils.poi.ExcelUtil;
import com.bonus.sgzb.common.core.web.controller.BaseController;
import com.bonus.sgzb.common.core.web.domain.AjaxResult;
import com.bonus.sgzb.common.core.web.page.TableDataInfo;
@ -15,7 +17,7 @@ import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
/**
@ -26,7 +28,7 @@ import java.util.List;
@Api(tags = "标段工程项目")
@RestController
@RequestMapping("/bmProjectLot")
public class BmProjectLotController extends BaseController{
public class BmProjectLotController extends BaseController {
@Autowired
private BmProjectLotService bmProjectLotService;
@ -36,32 +38,43 @@ public class BmProjectLotController extends BaseController{
*/
@ApiOperation(value = "获取标段工程项目")
@GetMapping("/projectLotAll")
public TableDataInfo getProjectLotAll(BmProjectLot bmProjectLot)
{
public TableDataInfo getProjectLotAll(BmProjectLot bmProjectLot) {
startPage();
List<BmProjectLot> list = bmProjectLotService.getProjectLotAll(bmProjectLot);
return getDataTable(list);
}
/**
* 新增项目管理
* 获取标段工程项
*/
@ApiOperation(value = "导出标段工程项目")
@PostMapping("/export")
public void export(HttpServletResponse response, BmProjectLot bmProjectLot) {
startPage();
List<BmProjectLot> list = bmProjectLotService.getProjectLotAll(bmProjectLot);
ExcelUtil<BmProjectLot> util = new ExcelUtil<BmProjectLot>(BmProjectLot.class);
util.exportExcel(response, list, "标段工程");
}
/**
* 新增项目管理
*/
@ApiOperation("新增标段工程项目")
@Log(title = "参数管理", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult projectLotAdd(@Validated @RequestBody BmProjectLot bmProjectLot)
{
public AjaxResult projectLotAdd(@Validated @RequestBody BmProjectLot bmProjectLot) {
return toAjax(bmProjectLotService.projectLotAdd(bmProjectLot));
}
/**
* 删除项目管理
* 删除项目管理
*/
@ApiOperation("删除项目管理")
@Log(title = "参数管理", businessType = BusinessType.DELETE)
@DeleteMapping ("/{lotId}")
public AjaxResult deleteProjectLotById(@PathVariable Long lotId)
{
@DeleteMapping("/{lotId}")
public AjaxResult deleteProjectLotById(@PathVariable Long lotId) {
bmProjectLotService.deleteProjectLotById(lotId);
return success();
}
@ -72,8 +85,7 @@ public class BmProjectLotController extends BaseController{
@ApiOperation("修改项目管理")
@Log(title = "参数管理", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@Validated @RequestBody BmProjectLot bmProjectLot)
{
public AjaxResult edit(@Validated @RequestBody BmProjectLot bmProjectLot) {
return toAjax(bmProjectLotService.updateBmProjectLot(bmProjectLot));
}

2
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/BmUnitInfoController.java
View File

@ -147,7 +147,7 @@ public class BmUnitInfoController extends BaseController{
@PostMapping("/export")
public void export(HttpServletResponse response, BmUnitInfo bmUnitInfo)
{
List<BmUnitInfo> list = bmUnitInfoService.getUnitInfo(bmUnitInfo);
List<BmUnitInfo> list = bmUnitInfoService.getUnitInfoAll(bmUnitInfo);
ExcelUtil<BmUnitInfo> util = new ExcelUtil<BmUnitInfo>(BmUnitInfo.class);
util.exportExcel(response, list, "往来单位");
}

70
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/MaPropInfoController.java
View File

@ -36,7 +36,7 @@ import java.util.List;
@Api(tags = "资产管理")
@RestController
@RequestMapping("maPropInfo")
public class MaPropInfoController extends BaseController {
public class MaPropInfoController extends BaseController {
/**
* 服务对象
*/
@ -46,49 +46,54 @@ public class MaPropInfoController extends BaseController {
/**
* 查询资产属性列表
*
* @param maPropInfo
* @return
*/
@GetMapping("/list")
@ApiOperation(value = "查询资产属性列表")
public TableDataInfo list(MaPropInfo maPropInfo)
{
public TableDataInfo list(MaPropInfo maPropInfo) {
startPage();
List<MaPropInfo> list = maPropInfoService.selectMaPropInfoList(maPropInfo);
return getDataTable(list);
}
/**
* 查询资产属性列表
* @param查询资产属性列表
*
* @return
* @param查询资产属性列表
*/
@GetMapping("/lists")
@ApiOperation(value = "查询资产属性列表")
public TableDataInfo list(String bindingName)
{
public TableDataInfo list(String bindingName) {
List<MaPropInfo> list = maPropInfoService.selectMaPropInfoLists(bindingName);
return getDataTable(list);
}
/**
* 根据类型名称查询类型
*
* @return 结果
*/
@ApiOperation(value = "根据类型名称查询类型")
@GetMapping("/getMaTypeList")
public TableDataInfo getMaTypeList(String typeName){
public TableDataInfo getMaTypeList(String typeName) {
startPage();
List<MaType> maTypeList = maPropInfoService.selectMaType(typeName);
return getDataTable(maTypeList);
}
/**
* 资产属性配置保存
*
* @param maPropSet
* @return
*/
@ApiOperation(value = "资产属性配置保存")
@Log(title = "参数管理", businessType = BusinessType.INSERT)
@PostMapping("/save")
public AjaxResult save(@Validated @RequestBody MaPropSet maPropSet){
public AjaxResult save(@Validated @RequestBody MaPropSet maPropSet) {
// Long fieldValue =maPropSet.getTypeId();
// Long fieldValues =maPropSet.getPropId();
// if (maPropSet.getPropName() != null){
@ -98,43 +103,47 @@ public class MaPropInfoController extends BaseController {
return toAjax(maPropInfoService.save(maPropSet));
}
/**
* 新建资产属性
*
* @param maPropInfo
* @return
*/
@ApiOperation(value = "新建资产属性")
@Log(title = "参数管理", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@Validated @RequestBody MaPropInfo maPropInfo){
public AjaxResult add(@Validated @RequestBody MaPropInfo maPropInfo) {
if (!maPropInfoService.checkPropNameUnique(maPropInfo)) {
return error("新增资产名称'" + maPropInfo.getPropName() + "'失败，资产名称已存在");
}
maPropInfo.setCreateBy(SecurityUtils.getUsername());
maPropInfo.setCreateBy(SecurityUtils.getLoginUser().getUsername());
return toAjax(maPropInfoService.insertMaPropInfo(maPropInfo));
}
/**
* 删除资产管理
*
* @param propId
* @return
*/
@ApiOperation(value = "删除资产管理")
@Log(title = "参数管理", businessType = BusinessType.DELETE)
@DeleteMapping("/{propId}")
public AjaxResult delete(@PathVariable("propId") Long propId){
public AjaxResult delete(@PathVariable("propId") Long propId) {
return toAjax(maPropInfoService.deleteMaPropById(propId));
}
/**
* 修改资产管理
*
* @param maPropInfo
* @return
*/
@ApiOperation(value = "修改资产管理")
@Log(title = "参数管理", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult update(@Validated @RequestBody MaPropInfo maPropInfo){
public AjaxResult update(@Validated @RequestBody MaPropInfo maPropInfo) {
if (!maPropInfoService.checkPropNameUnique(maPropInfo)) {
return error("新增资产名称'" + maPropInfo.getPropName() + "'失败，资产名称已存在");
}
@ -143,22 +152,38 @@ public class MaPropInfoController extends BaseController {
}
/**
* 资产属性导出
* 资产属性管理导出
*
* @param response
* @param propName
* @param maPropInfo
*/
@ApiOperation(value = "资产属性导出")
@Log(title = "资产属性导出", businessType = BusinessType.EXPORT)
@ApiOperation(value = "资产属性管理导出")
@Log(title = "资产属性管理导出", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, String propName)
{
// List<MaPropInfo> list = maPropInfoService.selectMaPropInfoList(propName);
// ExcelUtil<MaPropInfo> util = new ExcelUtil<MaPropInfo>(MaPropInfo.class);
// util.exportExcel(response, list, "资产属性类型数据");
public void export(HttpServletResponse response, MaPropInfo maPropInfo) {
List<MaPropInfo> list = maPropInfoService.selectMaPropInfoList(maPropInfo);
ExcelUtil<MaPropInfo> util = new ExcelUtil<MaPropInfo>(MaPropInfo.class);
util.exportExcel(response, list, "资产属性管理数据");
}
/**
* 资产属性配置导出
*
* @param response
* @param typeName
*/
@ApiOperation(value = "资产属性配置导出")
@Log(title = "资产属性配置导出", businessType = BusinessType.EXPORT)
@PostMapping("/exportConfig")
public void exportConfig(HttpServletResponse response, String typeName) {
List<MaType> list = maPropInfoService.selectMaType(typeName);
ExcelUtil<MaType> util = new ExcelUtil<MaType>(MaType.class);
util.exportExcel(response, list, "资产属性配置数据");
}
/**
* 资产属性管理导入
*
* @param file
* @param updateSupport
* @return
@ -167,8 +192,7 @@ public class MaPropInfoController extends BaseController {
@ApiOperation(value = "资产属性管理导入")
@Log(title = "资产属性管理导入", businessType = BusinessType.IMPORT)
@PostMapping("/importData")
public AjaxResult importData(MultipartFile file, boolean updateSupport) throws Exception
{
public AjaxResult importData(MultipartFile file, boolean updateSupport) throws Exception {
String fileName = file.getOriginalFilename();
if (fileName != null) {
String fileExtension = fileName.substring(fileName.lastIndexOf(".") + 1);

18
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/BmProjectInfo.java
View File

@ -9,7 +9,6 @@ import java.sql.Timestamp;
@Data
public class BmProjectInfo {
/**工程ID*/
@Excel(name = "工程ID")
@ApiModelProperty(value = "工程ID")
private long proId;
/**工程项目名称*/
@ -17,12 +16,12 @@ public class BmProjectInfo {
@ApiModelProperty(value = "工程项目名称")
private String proName;
/**帐号状态（0正常 1停用）*/
@Excel(name = "帐号状态（0正常 1停用）")
@Excel(name = "帐号状态",readConverterExp = "0=正常,1=停用")
@ApiModelProperty(value = "帐号状态（0正常 1停用）")
private String status;
/**工程类型*/
@Excel(name = "工程类型")
@ApiModelProperty(value = "工程类型")
private long typeId;
/**联系人*/
@ -34,45 +33,38 @@ public class BmProjectInfo {
@ApiModelProperty(value = "联系方式")
private String telphone;
/**所属上级*/
@Excel(name = "所属上级")
@ApiModelProperty(value = "所属上级")
private long deptId;
/**删除标志（0代表存在 2代表删除）*/
@Excel(name = "除标志（0代表存在 2代表删除）")
@ApiModelProperty(value = "除标志（0代表存在 2代表删除）")
private String delFlag;
/**创建者*/
@Excel(name = "创建者")
@ApiModelProperty(value = "创建者")
private String createBy;
/**创建时间*/
@Excel(name = "创建时间")
@ApiModelProperty(value = "创建时间")
private Timestamp createTime;
/**更新者*/
@Excel(name = "更新者")
@ApiModelProperty(value = "更新者")
private String updateBy;
/**更新时间*/
@Excel(name = "更新时间")
@ApiModelProperty(value = "更新时间")
private Timestamp updateTime;
/**备注*/
@Excel(name = "备注")
@ApiModelProperty(value = "备注")
private String remark;
/**数据所属组织*/
@Excel(name = "数据所属组织")
@ApiModelProperty(value = "数据所属组织")
private String companyId;
/**数据所属组织*/
@Excel(name = "所属组织名称")
@Excel(name = "所属上级")
@ApiModelProperty(value = "所属组织名称")
private String deptName;
/**工程类型名称*/
@Excel(name = "工程类型名称")
@Excel(name = "工程类型")
@ApiModelProperty(value = "工程类型名称")
private String typeName;

414
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/BmProjectLot.java
View File

@ -6,236 +6,266 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.sql.Timestamp;
@Data
public class BmProjectLot {
/**标段ID*/
@Excel(name = "标段ID")
@ApiModelProperty(value = "标段ID")
private long lotId;
/**工程ID*/
@Excel(name = "工程ID")
@ApiModelProperty(value = "工程ID")
private long proId;
/**标段工程项目名称*/
@Excel(name = "标段工程项目名称")
@ApiModelProperty(value = "标段工程项目名称")
private String lotName;
/**帐号状态（0正常 1停用）*/
@Excel(name = "帐号状态（0正常 1停用）")
@ApiModelProperty(value = "帐号状态（0正常 1停用）")
private String status;
/**
* 标段ID
*/
@ApiModelProperty(value = "标段ID")
private long lotId;
/**
* 工程ID
*/
@ApiModelProperty(value = "工程ID")
private long proId;
/**
* 标段工程项目名称
*/
@Excel(name = "标段工程名称")
@ApiModelProperty(value = "标段工程名称")
private String lotName;
/**
* 帐号状态（0正常 1停用）
*/
@Excel(name = "帐号状态", readConverterExp = "0=正常,1=停用）")
@ApiModelProperty(value = "帐号状态（0正常 1停用）")
private String status;
/**工程类型*/
@Excel(name = "工程类型")
@ApiModelProperty(value = "工程类型")
private long typeId;
/**联系人*/
@Excel(name = "联系人")
@ApiModelProperty(value = "联系人")
private String linkMan;
/**联系方式*/
@Excel(name = "联系方式")
@ApiModelProperty(value = "联系方式")
private String telphone;
/**所属工程*/
@Excel(name = "所属工程")
@ApiModelProperty(value = "所属工程")
private String ownPro;
/**所属上级*/
@Excel(name = "所属上级")
@ApiModelProperty(value = "所属上级")
private long deptId;
/**是否均摊财务帐（0不均摊，1均摊）*/
@Excel(name = "是否均摊财务帐（0不均摊，1均摊）")
@ApiModelProperty(value = "是否均摊财务帐（0不均摊，1均摊））")
private String isShare;
/**经度*/
@Excel(name = "经度")
@ApiModelProperty(value = "经度")
private String lon;
/**维度*/
@Excel(name = "维度")
@ApiModelProperty(value = "维度")
private String lat;
/**删除标志（0代表存在 2代表删除）*/
@Excel(name = "除标志（0代表存在 2代表删除）")
@ApiModelProperty(value = "除标志（0代表存在 2代表删除）")
private String delFlag;
/**创建者*/
@Excel(name = "创建者")
@ApiModelProperty(value = "创建者")
private String createBy;
/**创建时间*/
@Excel(name = "创建时间")
@ApiModelProperty(value = "创建时间")
private Timestamp createTime;
/**更新者*/
@Excel(name = "更新者")
@ApiModelProperty(value = "更新者")
private String updateBy;
/**更新时间*/
@Excel(name = "更新时间")
@ApiModelProperty(value = "更新时间")
private Timestamp updateTime;
/**备注*/
@Excel(name = "备注")
@ApiModelProperty(value = "备注")
private String remark;
/**数据所属组织*/
@Excel(name = "数据所属组织")
@ApiModelProperty(value = "数据所属组织")
private String companyId;
/**数据所属组织*/
@Excel(name = "所属组织名称")
@ApiModelProperty(value = "所属组织名称")
private String deptName;
/**
* 工程类型
*/
/**工程类型名称*/
@Excel(name = "工程类型名称")
@ApiModelProperty(value = "工程类型名称")
private String typeName;
@ApiModelProperty(value = "工程类型")
private long typeId;
/**
* 联系人
*/
@Excel(name = "联系人")
@ApiModelProperty(value = "联系人")
private String linkMan;
/**
* 联系方式
*/
@Excel(name = "联系方式")
@ApiModelProperty(value = "联系方式")
private String telphone;
/**
* 所属工程
*/
@Excel(name = "所属工程")
@ApiModelProperty(value = "所属工程")
private String ownPro;
/**
* 所属上级
*/
@ApiModelProperty(value = "所属上级")
private long deptId;
/**
* 是否均摊财务帐（0不均摊，1均摊）
*/
@ApiModelProperty(value = "是否均摊财务帐（0不均摊，1均摊））")
private String isShare;
/**
* 经度
*/
@ApiModelProperty(value = "经度")
private String lon;
/**
* 维度
*/
@ApiModelProperty(value = "维度")
private String lat;
/**
* 删除标志（0代表存在 2代表删除）
*/
@ApiModelProperty(value = "除标志（0代表存在 2代表删除）")
private String delFlag;
/**
* 创建者
*/
@ApiModelProperty(value = "创建者")
private String createBy;
/**
* 创建时间
*/
@ApiModelProperty(value = "创建时间")
private Timestamp createTime;
/**
* 更新者
*/
@ApiModelProperty(value = "更新者")
private String updateBy;
/**
* 更新时间
*/
@ApiModelProperty(value = "更新时间")
private Timestamp updateTime;
/**
* 备注
*/
@ApiModelProperty(value = "备注")
private String remark;
/**
* 数据所属组织
*/
@ApiModelProperty(value = "数据所属组织")
private String companyId;
/**
* 数据所属组织
*/
@Excel(name = "所属上级")
@ApiModelProperty(value = "所属组织名称")
private String deptName;
public long getLotId() {
return lotId;
}
/**
* 工程类型名称
*/
@Excel(name = "工程类型")
@ApiModelProperty(value = "工程类型名称")
private String typeName;
public void setLotId(long lotId) {
this.lotId = lotId;
}
public long getLotId() {
return lotId;
}
public long getProId() {
return proId;
}
public void setLotId(long lotId) {
this.lotId = lotId;
}
public void setProId(long proId) {
this.proId = proId;
}
public long getProId() {
return proId;
}
public String getLotName() {
return lotName;
}
public void setProId(long proId) {
this.proId = proId;
}
public void setLotName(String lotName) {
this.lotName = lotName;
}
public String getLotName() {
return lotName;
}
public String getStatus() {
return status;
}
public void setLotName(String lotName) {
this.lotName = lotName;
}
public void setStatus(String status) {
this.status = status;
}
public String getStatus() {
return status;
}
public long getTypeId() {
return typeId;
}
public void setStatus(String status) {
this.status = status;
}
public void setTypeId(long typeId) {
this.typeId = typeId;
}
public long getTypeId() {
return typeId;
}
public String getLinkMan() {
return linkMan;
}
public void setTypeId(long typeId) {
this.typeId = typeId;
}
public void setLinkMan(String linkMan) {
this.linkMan = linkMan;
}
public String getLinkMan() {
return linkMan;
}
public String getTelphone() {
return telphone;
}
public void setLinkMan(String linkMan) {
this.linkMan = linkMan;
}
public void setTelphone(String telphone) {
this.telphone = telphone;
}
public String getTelphone() {
return telphone;
}
public long getDeptId() {
return deptId;
}
public void setTelphone(String telphone) {
this.telphone = telphone;
}
public void setDeptId(long deptId) {
this.deptId = deptId;
}
public long getDeptId() {
return deptId;
}
public String getIsShare() {
return isShare;
}
public void setDeptId(long deptId) {
this.deptId = deptId;
}
public void setIsShare(String isShare) {
this.isShare = isShare;
}
public String getIsShare() {
return isShare;
}
public String getLon() {
return lon;
}
public void setIsShare(String isShare) {
this.isShare = isShare;
}
public void setLon(String lon) {
this.lon = lon;
}
public String getLon() {
return lon;
}
public String getLat() {
return lat;
}
public void setLon(String lon) {
this.lon = lon;
}
public void setLat(String lat) {
this.lat = lat;
}
public String getLat() {
return lat;
}
public String getDelFlag() {
return delFlag;
}
public void setLat(String lat) {
this.lat = lat;
}
public void setDelFlag(String delFlag) {
this.delFlag = delFlag;
}
public String getDelFlag() {
return delFlag;
}
public String getCreateBy() {
return createBy;
}
public void setDelFlag(String delFlag) {
this.delFlag = delFlag;
}
public void setCreateBy(String createBy) {
this.createBy = createBy;
}
public String getCreateBy() {
return createBy;
}
public Timestamp getCreateTime() {
return createTime;
}
public void setCreateBy(String createBy) {
this.createBy = createBy;
}
public void setCreateTime(Timestamp createTime) {
this.createTime = createTime;
}
public Timestamp getCreateTime() {
return createTime;
}
public String getUpdateBy() {
return updateBy;
}
public void setCreateTime(Timestamp createTime) {
this.createTime = createTime;
}
public void setUpdateBy(String updateBy) {
this.updateBy = updateBy;
}
public String getUpdateBy() {
return updateBy;
}
public Timestamp getUpdateTime() {
return updateTime;
}
public void setUpdateBy(String updateBy) {
this.updateBy = updateBy;
}
public void setUpdateTime(Timestamp updateTime) {
this.updateTime = updateTime;
}
public Timestamp getUpdateTime() {
return updateTime;
}
public String getRemark() {
return remark;
}
public void setUpdateTime(Timestamp updateTime) {
this.updateTime = updateTime;
}
public void setRemark(String remark) {
this.remark = remark;
}
public String getRemark() {
return remark;
}
public String getCompanyId() {
return companyId;
}
public void setRemark(String remark) {
this.remark = remark;
}
public void setCompanyId(String companyId) {
this.companyId = companyId;
}
public String getCompanyId() {
return companyId;
}
public void setCompanyId(String companyId) {
this.companyId = companyId;
}
}

31
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/BmUnitInfo.java
View File

@ -10,7 +10,6 @@ import java.sql.Timestamp;
@Data
public class BmUnitInfo {
/**类型ID*/
@Excel(name = "类型ID")
@ApiModelProperty(value = "类型ID")
private long unitId;
/**单位类型名称*/
@ -18,62 +17,56 @@ public class BmUnitInfo {
@ApiModelProperty(value = "类型ID")
private String unitName;
/**帐号状态（0正常 1停用）*/
@Excel(name = "帐号状态（0正常 1停用）")
@Excel(name = "帐号状态",readConverterExp ="0=正常,1=停用")
@ApiModelProperty(value = "类型ID")
private String status;
/**单位类型*/
@Excel(name = "单位类型")
@ApiModelProperty(value = "类型ID")
private long typeId;
/**联系人*/
@Excel(name = "联系人")
@ApiModelProperty(value = "类型ID")
@ApiModelProperty(value = "联系人")
private String linkMan;
/**联系方式*/
@Excel(name = "联系方式")
@ApiModelProperty(value = "类型ID")
@Excel(name = "联系电话")
@ApiModelProperty(value = "联系电话")
private String telphone;
/**所属上级*/
@Excel(name = "所属上级")
@ApiModelProperty(value = "类型ID")
private long deptId;
/**删除标志（0代表存在 2代表删除）*/
private String delFlag;
/**创建者*/
@Excel(name = "创建者")
@ApiModelProperty(value = "类型ID")
private String createBy;
/**创建时间*/
@Excel(name = "创建时间")
@ApiModelProperty(value = "类型ID")
private Timestamp createTime;
/**更新者*/
@Excel(name = "更新者")
@ApiModelProperty(value = "类型ID")
private String updateBy;
/**更新时间*/
@Excel(name = "更新时间")
@ApiModelProperty(value = "类型ID")
private Timestamp updateTime;
/**备注*/
@Excel(name = "备注")
@ApiModelProperty(value = "类型ID")
private String remark;
/**数据所属组织*/
@Excel(name = "数据所属组织")
@ApiModelProperty(value = "类型ID")
private String companyId;
@ApiModelProperty(value = "类型名称")
@Excel(name = "单位类型")
private String typeName;
@Excel(name = "所属组织名称")
@ApiModelProperty(value = "所属组织名称")
@Excel(name = "所属上级")
@ApiModelProperty(value = "所属上级")
private String deptName;
@Excel(name = "所属组织名称")
@ApiModelProperty(value = "所属组织名称")
@ApiModelProperty(value = "用户id")
private String userId;
@Excel(name = "所属组织名称")
@ApiModelProperty(value = "所属组织名称")
@ApiModelProperty(value = "用户名")
private String userName;
public long getUnitId() {

13
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/MaPropInfo.java
View File

@ -9,12 +9,11 @@ public class MaPropInfo {
/**
* 资产ID
*/
@Excel(name = "资产ID")
private long propId;
/**
* 资产名称
*/
@Excel(name = "资产名称")
@Excel(name = "资产类型名称")
private String propName;
/**
* 资产编号
@ -24,11 +23,11 @@ public class MaPropInfo {
/**
* 帐号状态（0正常 1停用）
*/
@Excel(name = "状态",readConverterExp = "0=正常,1=停用")
private String status;
/**
* 组织ID
*/
@Excel(name = "组织ID")
private String deptId;
/**
* 删除标志（0代表存在 2代表删除）
@ -37,35 +36,29 @@ public class MaPropInfo {
/**
* 创建者
*/
@Excel(name = "创建者")
private String createBy;
/**
* 创建时间
*/
@Excel(name = "创建时间")
private java.sql.Timestamp createTime;
/**
* 更新者
*/
@Excel(name = "更新者")
private String updateBy;
/**
* 更新时间
*/
@Excel(name = "更新时间")
private java.sql.Timestamp updateTime;
/**
* 备注
*/
@Excel(name = "备注")
private String remark;
/**
* 数据所属组织
*/
@Excel(name = "数据所属组织")
private String companyId;
@Excel(name = "组织名称")
@Excel(name = "所属上级")
private String deptName;
public long getPropId() {

11
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/RepairServiceImpl.java
View File

@ -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);
}
}

17
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/vo/MaLabelBindVO.java
View File

@ -1,5 +1,6 @@
package com.bonus.sgzb.base.vo;
import com.bonus.sgzb.common.core.annotation.Excel;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Data;
@ -25,6 +26,7 @@ public class MaLabelBindVO {
private Long labelType;
//标签编号
@Excel(name = "标签编号", sort = 2)
@ApiModelProperty(value = "标签编号")
private String labelCode;
@ -34,6 +36,7 @@ public class MaLabelBindVO {
//绑定时间
@ApiModelProperty(value = "绑定时间")
@Excel(name = "绑定时间", sort = 8)
private String bindTime;
//是否绑定(0 是, 1 否)
@ -41,37 +44,43 @@ public class MaLabelBindVO {
private String isBind;
//规格型号
@ApiModelProperty(value = "规格型号")
@Excel(name = "规格型号", sort = 5)
private String typeName;
@ApiModelProperty(value = "规格型号")
private String modelId;
//设备类型
@ApiModelProperty(value = "设备类型")
@Excel(name = "物品名称", sort = 4)
private String modelName;
//物品种类
@ApiModelProperty(value = "物品种类")
private String wpName;
//物品种类
@ApiModelProperty(value = "物品种类")
@Excel(name = "物品类型", sort = 3)
private String kindName;
//机具编号
@ApiModelProperty(value = "类型名称")
@ApiModelProperty(value = "设备编码")
@Excel(name = "设备编码", sort = 6)
private String maCode;
//机具编号
@ApiModelProperty(value = "类型名称")
@ApiModelProperty(value = "机具id")
private String maId;
//机具编号
@ApiModelProperty(value = "组织")
private String companyId;
@ApiModelProperty(value = "物品种类")
@Excel(name = "标签类型", sort = 1)
private String name;
//是否绑定(0 是, 1 否)
@ApiModelProperty(value = "狀態")
@ApiModelProperty(value = "状态")
@Excel(name = "操作类型", sort = 9, readConverterExp = "1=正常")
private String status;
@ApiModelProperty(value = "用户姓名")
@Excel(name = "绑定人员", sort = 7)
private String userName;
@ApiModelProperty(value = "中间表主键")
private String id;

6
sgzb-modules/sgzb-base/src/main/resources/mapper/app/LeaseApplyInfoMapper.xml
View File

@ -125,6 +125,9 @@
<if test="leaseType != null and leaseType != ''">
lease_type,
</if>
<if test="estimateLeaseTime != null">
estimate_lease_time,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="code != null">
@ -181,6 +184,9 @@
<if test="leaseType != null and leaseType != ''">
#{leaseType,jdbcType=VARCHAR},
</if>
<if test="estimateLeaseTime != null">
#{estimateLeaseTime,jdbcType=TIMESTAMP},
</if>
</trim>
</insert>

39
sgzb-modules/sgzb-base/src/main/resources/mapper/app/LeaseOutDetailsMapper.xml
View File

@ -172,6 +172,10 @@
AND
DATE(start_time) = CURDATE();
</select>
<select id="selectByTypeId" resultType="com.bonus.sgzb.base.api.domain.MaType">
select * from ma_type WHERE
type_id = #{record.typeId}
</select>
<update id="updateLeaseApplyDetailsOutNum">
UPDATE
@ -345,4 +349,39 @@
insert into slt_agreement_info (agreement_id,type_id,ma_id,num,start_time,status,lease_id,lease_price,buy_price,is_slt,company_id)
values (#{agreementId},#{record.typeId},#{record.maId},#{record.outNum},now(),0,#{record.parentId},#{ma.finalPrice},#{ma.buyPrice},'0',#{record.companyId});
</insert>
<select id="leaseOutRecordList" resultType="com.bonus.sgzb.base.api.domain.LeaseOutDetails">
SELECT
tt.task_id,
tt.task_status,
tt.`code`,
tt.create_time,
bui.unit_name AS unitName,
bpl.lot_name AS proName,
COALESCE(SUM(lad.pre_num), 0) AS preNum,
COALESCE(SUM(lad.al_num), 0) AS outNum
FROM
tm_task tt
LEFT JOIN tm_task_agreement tta ON tta.task_id = tt.task_id
LEFT JOIN bm_agreement_info bai ON bai.agreement_id = tta.agreement_id
LEFT JOIN bm_project_lot bpl ON bpl.lot_id = bai.project_id
LEFT JOIN bm_unit_info bui ON bui.unit_id = bai.unit_id
LEFT JOIN lease_apply_info lai ON lai.task_id = tt.task_id
LEFT JOIN lease_apply_details lad ON lad.parennt_id = lai.id AND lad.pre_num IS NOT NULL
WHERE
tt.task_type = '29'
AND tt.`status` = '1'
AND tt.task_status IN ('33', '34', '35')
<if test="code != null and code != ''">
AND tt.`code` like concat('%', #{code}, '%')
</if>
<if test="proName != null and proName != ''">
AND bpl.lot_name like concat('%', #{proName}, '%')
</if>
<if test="unitName != null and unitName != ''">
AND bui.unit_name like concat('%', #{unitName}, '%')
</if>
GROUP BY
tt.task_id
</select>
</mapper>

16
sgzb-modules/sgzb-base/src/main/resources/mapper/app/PurchaseInputMapper.xml
View File

@ -164,4 +164,20 @@
<select id="selectMacodeInfoStatusByTaskId" resultType="java.lang.Integer">
select count(*) from purchase_macode_info where task_id = #{taskId} and status not in ('1','2')
</select>
<select id="isOperateAll" resultType="java.lang.Integer">
SELECT
count(*)
FROM
purchase_check_details
WHERE
task_id = #{taskId} and (status = 1 or status=6)
</select>
<select id="selectPurchaseCheckDetailsStatus" resultType="java.lang.Integer">
SELECT
count(*)
FROM
purchase_check_details
WHERE
task_id = #{taskId} and status =4
</select>
</mapper>

26
sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml
View File

@ -458,14 +458,14 @@
tt.*, su.phonenumber AS phoneNumber, sd.dept_name as deptName,
bpl.lot_id as proId,bpl.lot_name as proName,
bui.unit_id as unitId,bui.unit_name as unitName,
lai.lease_person as leasePerson, lai.phone as leasePhone, tt.create_by as applyFor,d.`name` as taskName,lai.lease_type as leaseType,
lai.lease_person as leasePerson, lai.phone as leasePhone, tt.create_by as applyFor,d.`name` as taskName,lai.lease_type as leaseType,lai.estimate_lease_time as estimateLeaseTime,
case when d.id = '30' then lai.company_audit_remark
when d.id = '31' then lai.dept_audit_remark
when d.id = '32' then lai.direct_audit_remark
when d.id = '98' then lai.company_audit_remark
when d.id = '99' then lai.dept_audit_remark
when d.id = '100' then lai.direct_audit_remark
end examineStatus ,
end examineStatus,
d.id as examineStatusId,
bai.agreement_code as agreementCode,
tt.create_time as createTimes, tt.update_time as updateTimes
@ -494,11 +494,12 @@
</if>
<if test="record.projectId != null and record.projectId != ''">
AND bpi.pro_id = #{record.projectId}
AND bpl.lot_id = #{record.projectId}
</if>
<if test="record.keyWord != null and record.keyWord != ''">
AND bai.agreement_code like concat('%', #{record.keyWord}, '%')
AND (bai.agreement_code like concat('%', #{record.keyWord}, '%') or
tt.code like concat('%', #{record.keyWord}, '%'))
</if>
ORDER BY tt.update_time DESC
</select>
@ -508,7 +509,7 @@
tt.*, su.phonenumber AS phoneNumber, sd.dept_name as deptName,
bpl.lot_id as proId,bpl.lot_name as proName,
bui.unit_id as unitId,bui.unit_name as unitName,
lai.lease_person as leasePerson, lai.phone as leasePhone, tt.create_by as applyFor,d.`name` as taskName,
lai.lease_person as leasePerson, lai.phone as leasePhone,lai.lease_type as leaseType, lai.estimate_lease_time as estimateLeaseTime,tt.create_by as applyFor,d.`name` as taskName,
case when d.id = '30' then lai.company_audit_remark
when d.id = '31' then lai.dept_audit_remark
when d.id = '32' then lai.direct_audit_remark
@ -544,7 +545,7 @@
</if>
<if test="record.projectId != null and record.projectId != ''">
AND bpi.pro_id = #{record.projectId}
AND bpl.lot_id = #{record.projectId}
</if>
<if test="record.keyWord != null and record.keyWord != ''">
@ -626,6 +627,7 @@
lai.direct_audit_time as directAuditTime,
lai.direct_audit_remark as directAuditRemark,
lai.lease_type as leaseType,
lai.estimate_lease_time as estimateLeaseTime,
d.id as examineStatusId,
bai.agreement_code as agreementCode,
@ -710,6 +712,7 @@
company_audit_by = #{record.companyAuditBy},
company_audit_time = now(),
company_audit_remark = #{record.companyAuditRemark},
status = #{record.status},
</if>
<if test="record.examineStatusId == 99 and record.examineStatusId == '99'">
dept_audit_by = #{record.companyAuditBy},
@ -808,7 +811,7 @@
tt.*, su.phonenumber AS phoneNumber, sd.dept_name as deptName,
bpl.lot_id as proId,bpl.lot_name as proName,
bui.unit_id as unitId,bui.unit_name as unitName,
lai.lease_person as leasePerson, lai.phone as leasePhone, tt.create_by as applyFor,d.`name` as taskName,lai.lease_type as leaseType,
lai.lease_person as leasePerson, lai.phone as leasePhone, tt.create_by as applyFor,d.`name` as taskName,lai.lease_type as leaseType,lai.estimate_lease_time as estimateLeaseTime,
case when d.id = '30' then lai.company_audit_remark
when d.id = '31' then lai.dept_audit_remark
when d.id = '32' then lai.direct_audit_remark
@ -844,11 +847,12 @@
</if>
<if test="record.projectId != null and record.projectId != ''">
AND bpi.pro_id = #{record.projectId}
AND bpl.lot_id = #{record.projectId}
</if>
<if test="record.keyWord != null and record.keyWord != ''">
AND bai.agreement_code like concat('%', #{record.keyWord}, '%')
AND (bai.agreement_code like concat('%', #{record.keyWord}, '%') or
tt.code like concat('%', #{record.keyWord}, '%'))
</if>
ORDER BY tt.update_time DESC
</select>
@ -912,7 +916,7 @@
LEFT JOIN lease_apply_details lad on lai.id = lad.parennt_id
LEFT JOIN ma_type_keeper mtk on lad.type_id = mtk.type_id
WHERE tt.task_status in(33,34,35)
<if test="userId != '1'">
<if test="userId != 1">
and mtk.user_id = #{userId}
</if>
GROUP BY lai.id
@ -937,7 +941,7 @@
LEFT JOIN ma_type_keeper mtk on lad.type_id = mtk.type_id
WHERE
lad.parennt_id = #{id}
<if test="userId != '1'">
<if test="userId != 1">
and mtk.user_id = #{userId}
</if>
</select>

2
sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaPropInfoMapper.xml
View File

@ -224,7 +224,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</select>
<select id="checkPropNameUnique" resultType="com.bonus.sgzb.base.domain.MaPropInfo" resultMap="MaPropInfoResult">
<include refid="selectMaPropInfoVo"/>
where prop_name = #{propName} limit 1
where prop_name = #{propName} and del_flag = '0' limit 1
</select>
<select id="checkPropIdUnique" resultType="com.bonus.sgzb.base.domain.MaPropSet" resultMap="MaPropSetResult">
select id,prop_id,type_id,status,del_flag,create_by,create_time,update_by,update_time,remark,company_id

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

@ -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<PurchaseCheckDetails> purchaseCheckDetailsList)
{

4
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/PurchaseCheckServiceCenterController.java
View File

@ -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));

5
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/PurchaseMacodeInfoController.java
View File

@ -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));

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

@ -106,4 +106,11 @@ public interface PurchaseCheckInfoMapper
* @return
*/
List<PurchaseCheckInfo> selectPutInListExamine(PurchaseCheckInfo purchaseCheckInfo);
/**
* 查询 类型名称和管理类型
* @param taskId
* @return
*/
List<PurchaseCheckInfo> selectTypeNameAndManageTypeByTaskId(Long taskId);
}

13
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/PurchaseMacodeInfoMapper.java
View File

@ -264,4 +264,17 @@ public interface PurchaseMacodeInfoMapper {
List<PurchaseMacodeInfo> warehousingEntry(PurchaseMacodeInfo purchaseMacodeInfo);
List<PurchaseMacodeInfo> selectPutinDetailsAddTypeId(PurchaseMacodeInfo purchaseMacodeInfo);
/**
* 判断是否全部已操作（不通过或通过）
* @param taskId
* @return int
*/
int isOperateAll(Long taskId);
/**
* 是否为全部不通过
* @param taskId
* @return
*/
int selectPurchaseCheckDetailsStatus(Long taskId);
}

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

@ -37,9 +37,9 @@ public interface IPurchaseCheckDetailsService
public int insertPurchaseCheckDetails(List<PurchaseCheckDetails> purchaseCheckDetailsList);
/**
* 修改新购验收任务详细purchase_check_details
* 验收审核
*
* @param purchaseCheckDetailsList 新购验收任务详细purchase_check_details
* @param purchaseCheckDetailsList
* @return 结果
*/
public int updatePurchaseCheckDetails(List<PurchaseCheckDetails> purchaseCheckDetailsList);

2
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/IPurchaseMacodeInfoService.java
View File

@ -79,7 +79,7 @@ public interface IPurchaseMacodeInfoService
*/
int deletePurchaseMacodeInfoById(Long id);
/**
* 修改编码管理的入库状态
* 新购入库审核 通过/不通过
* @param maInputVO
* @return
*/

3
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/PurchaseCheckServiceCenterService.java
View File

@ -110,7 +110,8 @@ public interface PurchaseCheckServiceCenterService
List<PurchaseMacodeInfo> selectPutinDetails(PurchaseMacodeInfo purchaseMacodeInfo);
/**
* 修改编码管理的入库状态
* 综合服务中心审核
* 审核-通过/不通过
* @param maInputVO
* @return
*/

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

@ -65,10 +65,8 @@ public class PurchaseCheckDetailsServiceImpl implements IPurchaseCheckDetailsSer
}
/**
* 修改新购验收任务详细purchase_check_details
*
* @param purchaseCheckDetailsList 新购验收任务详细purchase_check_details
* @return 结果
* 验收审核
* 通过/不通过
*/
@Override
@Transactional(rollbackFor = Exception.class)

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

@ -116,7 +116,16 @@ public class PurchaseCheckInfoServiceImpl implements IPurchaseCheckInfoService {
public List<PurchaseCheckInfo> selectPurchaseCheckInfoList(PurchaseCheckInfo purchaseCheckInfo) {
List<PurchaseCheckInfo> purchaseCheckInfos = purchaseCheckInfoMapper.selectPurchaseCheckInfoList(purchaseCheckInfo);
for (PurchaseCheckInfo checkInfo : purchaseCheckInfos) {
String typeName = purchaseCheckInfoMapper.selectTypeNameByTaskId(checkInfo.getTaskId(),"1");
String typeName="";
List<PurchaseCheckInfo> list = purchaseCheckInfoMapper.selectTypeNameAndManageTypeByTaskId(checkInfo.getTaskId());
if (list.size()>0){
typeName = list.get(0).getPurchasingTypeName();
if (list.get(0).getManageType().contains("0")){
checkInfo.setManageType("0");
}else {
checkInfo.setManageType("1");
}
}
checkInfo.setPurchasingTypeName(typeName);
}
return purchaseCheckInfos;

51
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseMacodeInfoServiceImpl.java
View File

@ -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<PurchaseMacodeInfo> selectPutinDetailsAddTypeId(PurchaseMacodeInfo purchaseMacodeInfo) {
return purchaseMacodeInfoMapper.selectPutinDetailsAddTypeId(purchaseMacodeInfo);
}
/**
* 根据机具编码删除编码

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

@ -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
<if test="taskId != null ">and pcd.task_id = #{taskId}</if>
<if test="keyWord != null and keyWord != ''">and (mt.type_name like concat('%',#{keyWord},'%')
or mt1.type_name like concat('%',#{keyWord}) or msi.supplier like concat('%',#{keyWord}))
<if test="keyWord != null and keyWord != ''">
and (mt.type_name like concat('%',#{keyWord},'%')
or mt1.type_name like concat('%',#{keyWord},'%') or msi.supplier like concat('%',#{keyWord},'%'))
</if>
<if test="typeId != null ">and pcd.type_id = #{typeId}</if>
<if test="purchasePrice != null and purchasePrice != ''">and pcd.purchase_price = #{purchasePrice}</if>

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

@ -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)
<if test="keyWord != null and keyWord != ''"> and tk.code like concat('%',#{keyWord},'%')</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>
@ -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)
<if test="keyWord != null and keyWord != ''"> and tk.code like concat('%',#{keyWord},'%')</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>
@ -281,4 +281,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="companyId != null "> and pci.company_id = #{companyId}</if>
order by pci.id desc
</select>
<select id="selectTypeNameAndManageTypeByTaskId"
resultType="com.bonus.sgzb.material.domain.PurchaseCheckInfo">
select GROUP_CONCAT(type_name) purchasingTypeName, GROUP_CONCAT(manage_type) manageType from
(select distinct pcd.task_id, mt1.type_name,IFNULL(mt.manage_type,'0') as manage_type
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>

4
sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckServiceCenterMapper.xml
View File

@ -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)
<if test="keyWord != null and keyWord != ''">
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
</select>
<select id="selectPurchaseCheckDetailsStatus" resultType="java.lang.Integer">
SELECT

16
sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseMacodeInfoMapper.xml
View File

@ -482,6 +482,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</if>
order by status
</select>
<select id="isOperateAll" resultType="java.lang.Integer">
SELECT
count(*)
FROM
purchase_check_details
WHERE
task_id = #{taskId} and (status = 1 or status=6)
</select>
<select id="selectPurchaseCheckDetailsStatus" resultType="java.lang.Integer">
SELECT
count(*)
FROM
purchase_check_details
WHERE
task_id = #{taskId} and status =4
</select>
<update id="updateTypeByTypeId">
update ma_type set num = #{num} where type_id = #{typeId}

24
sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/domain/PurchaseNoticePerson.java
View File

@ -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)

1
sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/domain/SysPost.java
View File

@ -31,7 +31,6 @@ public class SysPost extends BaseEntity
private String postName;
/** 岗位排序 */
@Excel(name = "岗位排序")
private Integer postSort;
/** 状态（0正常 1停用） */

64
sgzb-modules/sgzb-system/src/main/resources/mapper/system/PurchaseNoticePersonMapper.xml
View File

@ -9,6 +9,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="userId" column="user_id" />
<result property="userName" column="user_name" />
<result property="telphone" column="telphone" />
<result property="nickName" column="nick_name" />
</resultMap>
<sql id="selectPurchaseNoticePersonVo">
@ -16,16 +17,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</sql>
<select id="selectPurchaseNoticePersonList" parameterType="com.bonus.sgzb.system.domain.PurchaseNoticePerson" resultMap="PurchaseNoticePersonResult">
select pnp.id, pnp.user_id, pnp.user_name, telphone,r.role_name,concat(d2.dept_name,'/',d1.dept_name,'/',d.dept_name) deptName
from purchase_notice_person pnp
left join sys_user u on pnp.user_id = u.user_id
left join sys_user_role sur on u.user_id = sur.user_id
left join sys_role r on sur.role_id = r.role_id
left join sys_dept d on u.dept_id = d.dept_id
left join sys_dept d1 on d.parent_id = d1.dept_id
left join sys_dept d2 on d1.parent_id = d2.dept_id
where u.status = '0'
SELECT
pnp.id,
pnp.user_id,
pnp.user_name,
u.nick_name,
telphone,
GROUP_CONCAT(r.role_name SEPARATOR '/') as role_name,
concat( d2.dept_name, '/', d1.dept_name, '/', d.dept_name ) deptName
FROM
purchase_notice_person pnp
LEFT JOIN sys_user u ON pnp.user_id = u.user_id
LEFT JOIN sys_user_role sur ON u.user_id = sur.user_id
LEFT JOIN sys_role r ON sur.role_id = r.role_id
LEFT JOIN sys_dept d ON u.dept_id = d.dept_id
LEFT JOIN sys_dept d1 ON d.parent_id = d1.dept_id
LEFT JOIN sys_dept d2 ON d1.parent_id = d2.dept_id
WHERE
u.STATUS = '0'
GROUP BY pnp.user_id
</select>
<select id="selectPurchaseNoticePersonById" parameterType="Long" resultMap="PurchaseNoticePersonResult">
@ -33,15 +43,31 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
where id = #{id}
</select>
<select id="getUserByRoleList" resultType="com.bonus.sgzb.system.domain.PurchaseNoticePerson">
select u.user_id userId, u.dept_id deptId, u.nick_name nickName, u.user_name userName, u.avatar, u.phonenumber telphone,
concat(d2.dept_name,'/',d1.dept_name,'/',d.dept_name) deptName,r.role_name roleName
from sys_user u
left join sys_user_role sur on u.user_id = sur.user_id
left join sys_role r on sur.role_id = r.role_id
left join sys_dept d on u.dept_id = d.dept_id
left join sys_dept d1 on d.parent_id = d1.dept_id
left join sys_dept d2 on d1.parent_id = d2.dept_id
where u.status = '0' and u.del_flag = '0' and u.user_id not in (select user_id from purchase_notice_person)
SELECT
u.user_id userId,
u.dept_id deptId,
u.nick_name nickName,
u.user_name userName,
u.avatar,
u.phonenumber telphone,
concat( d2.dept_name, '/', d1.dept_name, '/', d.dept_name ) deptName,
GROUP_CONCAT(r.role_name SEPARATOR '/') as roleName
FROM
sys_user u
LEFT JOIN sys_user_role sur ON u.user_id = sur.user_id
LEFT JOIN sys_role r ON sur.role_id = r.role_id
LEFT JOIN sys_dept d ON u.dept_id = d.dept_id
LEFT JOIN sys_dept d1 ON d.parent_id = d1.dept_id
LEFT JOIN sys_dept d2 ON d1.parent_id = d2.dept_id
WHERE
u.STATUS = '0'
AND u.del_flag = '0'
AND u.user_id NOT IN (
SELECT
user_id
FROM
purchase_notice_person)
GROUP BY u.user_id
</select>
<insert id="insertPurchaseNoticePerson" parameterType="com.bonus.sgzb.system.domain.PurchaseNoticePerson">

2
sgzb-modules/sgzb-system/src/main/resources/mapper/system/SysUserMapper.xml
View File

@ -217,7 +217,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</delete>
<delete id="deleteUserByIds" parameterType="Long">
update sys_user set del_flag = '2' where user_id in
delete from sys_user where user_id in
<foreach collection="array" item="userId" open="(" separator="," close=")">
#{userId}
</foreach>

2
sgzb-ui/src/views/store/newBuy/newDevices/newDevicesList.vue
View File

@ -145,7 +145,7 @@
size="mini"
type="warning"
icon="el-icon-edit"
v-if="scope.row.purchasingStatus=='已验收合格' ||scope.row.purchasingStatus=='待审核'"
v-if="(scope.row.purchasingStatus=='已验收合格' ||scope.row.purchasingStatus=='待审核') && scope.row.manageType!='1'"
@click="handleCode(scope.row)"
>编码管理</el-button>
<el-button

1
sgzb-ui/src/views/store/newBuy/newDevices/newDevicesServiceCenterList.vue
View File

@ -74,6 +74,7 @@
<span v-if="scope.row.taskStatus=='105'">入库待审核</span>
<span v-if="scope.row.taskStatus=='106'">已驳回</span>
<span v-if="scope.row.taskStatus=='28'">已入库</span>
<span v-if="scope.row.taskStatus=='107'">入库驳回</span>
</template>
</el-table-column>
<el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true" />