问题修改
This commit is contained in:
jiang
parent
a1d5f3ac04
commit
59d67fbadc
|
|
@ -4,17 +4,14 @@ import com.bonus.common.core.utils.StringUtils;
|
|||
import com.bonus.common.security.utils.SecurityUtils;
|
||||
import com.bonus.material.devchange.domain.DeviceCountBean;
|
||||
import com.bonus.material.devchange.domain.DeviceTreeBean;
|
||||
import com.bonus.material.devchange.domain.MaDevInfo;
|
||||
import com.bonus.material.devchange.domain.MapBean;
|
||||
import com.bonus.material.devchange.mapper.MaDevInfoMapper;
|
||||
import com.bonus.material.device.domain.vo.DevInfoPropertyVo;
|
||||
import com.bonus.material.device.domain.vo.DevMergeVo;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
|
||||
import com.bonus.material.devchange.domain.MaDevInfo;
|
||||
|
||||
import java.security.Security;
|
||||
import java.util.*;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
|
|
@ -33,9 +30,6 @@ public class MaDevInfoServiceImpl implements MaDevInfoService {
|
|||
list.forEach(item -> {
|
||||
List<DevInfoPropertyVo> propertiiesList = mapper.getProperties(item);
|
||||
if (propertiiesList != null && !propertiiesList.isEmpty()) {
|
||||
// String json= JSON.toJSONString(devInfoPropertyVos);
|
||||
// vo.setJsonData(json);
|
||||
// mapper.updateJson(vo);
|
||||
item.setPropertyVoList(propertiiesList);
|
||||
}
|
||||
});
|
||||
|
|
|
|||
|
|
@ -62,7 +62,6 @@ public class DevInfo extends BaseEntity {
|
|||
private String identifyCode;
|
||||
|
||||
@ApiModelProperty(value = "装备名称")
|
||||
@NotBlank
|
||||
private String deviceName;
|
||||
|
||||
@ApiModelProperty(value = "整机装备重量")
|
||||
|
|
@ -82,7 +81,6 @@ public class DevInfo extends BaseEntity {
|
|||
private BigDecimal ratio;
|
||||
|
||||
@ApiModelProperty(value = "单位")
|
||||
@NotBlank(message = "单位不能为空")
|
||||
private String unitName;
|
||||
|
||||
/**
|
||||
|
|
@ -102,7 +100,6 @@ public class DevInfo extends BaseEntity {
|
|||
*/
|
||||
@Excel(name = "类型id")
|
||||
@ApiModelProperty(value = "类型id")
|
||||
@NotNull
|
||||
private Long typeId;
|
||||
|
||||
@ApiModelProperty(value = "装备类别")
|
||||
|
|
@ -153,7 +150,6 @@ public class DevInfo extends BaseEntity {
|
|||
*/
|
||||
@Excel(name = "设备品牌")
|
||||
@ApiModelProperty(value = "设备品牌")
|
||||
@NotBlank
|
||||
private String brand;
|
||||
|
||||
/**
|
||||
|
|
@ -168,7 +164,6 @@ public class DevInfo extends BaseEntity {
|
|||
*/
|
||||
@Excel(name = "出厂日期")
|
||||
@ApiModelProperty(value = "出厂日期")
|
||||
@NotNull
|
||||
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
|
||||
private Date productionDate;
|
||||
|
||||
|
|
@ -198,7 +193,6 @@ public class DevInfo extends BaseEntity {
|
|||
*/
|
||||
@Excel(name = "设备天租价")
|
||||
@ApiModelProperty(value = "设备天租价")
|
||||
@NotNull
|
||||
private Float dayLeasePrice;
|
||||
|
||||
/**
|
||||
|
|
@ -250,11 +244,9 @@ public class DevInfo extends BaseEntity {
|
|||
private Long creator;
|
||||
|
||||
@ApiModelProperty(value = "联系人")
|
||||
@NotBlank
|
||||
private String person;
|
||||
|
||||
@ApiModelProperty(value = "联系人电话")
|
||||
@NotBlank
|
||||
@Size(min = 11, max = 11, message = "手机号长度不能超过11位")
|
||||
private String personPhone;
|
||||
|
||||
|
|
|
|||
|
|
@ -89,6 +89,7 @@ public class DevMergeServiceImpl implements DevMergeService {
|
|||
public AjaxResult addOrder() {
|
||||
DevMergeVo o = new DevMergeVo();
|
||||
o.setCreateUser(SecurityUtils.getLoginUser().getSysUser().getNickName());
|
||||
o.setOrderNumber(generate());
|
||||
Integer i = devMergeMapper.addOrder(o);
|
||||
return AjaxResult.success("添加成功", o);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -154,7 +154,7 @@
|
|||
</if>
|
||||
|
||||
<if test="deviceName != null and deviceName !=''">
|
||||
and mdi.device_name, like concat('%',#{deviceName},'%')
|
||||
and mdi.device_name like concat('%',#{deviceName},'%')
|
||||
</if>
|
||||
|
||||
<if test="code != null and code !=''">
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
FROM
|
||||
cs_device_status aaa
|
||||
LEFT JOIN cs_device_real_dev bbb ON aaa.id = bbb.cs_id
|
||||
LEFT JOIN ma_dev_info mdi ON bbb.dev_id = mdi.ma_id
|
||||
LEFT JOIN ma_dev_info mdi ON bbb.dev_id = mdi.ma_id AND mdi.is_active = '1'
|
||||
where aaa.is_active = 1
|
||||
<if test="status != null and status != ''">
|
||||
and aaa.status = #{status}
|
||||
|
|
@ -29,7 +29,6 @@
|
|||
|
||||
<select id="devList" resultType="com.bonus.material.device.domain.vo.DevInfoVo">
|
||||
SELECT
|
||||
cdrd.cs_id AS csId,
|
||||
cds.order_number AS orderNumber,
|
||||
cds.create_user AS createUser,
|
||||
cds.create_time AS createTime,
|
||||
|
|
|
|||
Loading…
Reference in New Issue