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

bug修改

This commit is contained in:
mashuai 2024-04-25 14:51:11 +08:00
parent f99aa9aa31
commit ff893914d9
12 changed files with 76 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -243,7 +243,7 @@ public class TmTaskController extends BaseController {
} else {
return AjaxResult.error("创建任务失败");
}
return AjaxResult.success("任务创建成功,已完成");
return AjaxResult.success("任务创建成功");
} catch (Exception e) {
return AjaxResult.error("创建任务失败," + e.getCause().toString() + "," + e.getMessage());
}

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

@ -78,9 +78,9 @@ public class MaPropInfoController extends BaseController {
*/
@ApiOperation(value = "根据类型名称查询类型")
@GetMapping("/getMaTypeList")
public TableDataInfo getMaTypeList(String typeName) {
public TableDataInfo getMaTypeList(MaPropInfo maPropInfo) {
startPage();
List<MaType> maTypeList = maPropInfoService.selectMaType(typeName);
List<MaType> maTypeList = maPropInfoService.selectMaType(maPropInfo);
return getDataTable(maTypeList);
}
@ -170,13 +170,13 @@ public class MaPropInfoController extends BaseController {
* 资产属性配置导出
*
* @param response
* @param typeName
* @param maPropInfo
*/
@ApiOperation(value = "资产属性配置导出")
@Log(title = "资产属性配置导出", businessType = BusinessType.EXPORT)
@PostMapping("/exportConfig")
public void exportConfig(HttpServletResponse response, String typeName) {
List<MaType> list = maPropInfoService.selectMaType(typeName);
public void exportConfig(HttpServletResponse response, MaPropInfo maPropInfo) {
List<MaType> list = maPropInfoService.selectMaType(maPropInfo);
ExcelUtil<MaType> util = new ExcelUtil<MaType>(MaType.class);
util.exportExcel(response, list, "资产属性配置数据");
}

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

@ -6,6 +6,8 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.sql.Timestamp;
import java.util.List;
@Data
public class BmProjectInfo {
/**工程ID*/
@ -68,6 +70,17 @@ public class BmProjectInfo {
@ApiModelProperty(value = "工程类型名称")
private String typeName;
/** 导出选中列表 */
private List<Long> dataCondition;
public List<Long> getDataCondition() {
return dataCondition;
}
public void setDataCondition(List<Long> dataCondition) {
this.dataCondition = dataCondition;
}
public long getProId() {
return proId;
}

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

@ -6,6 +6,7 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.sql.Timestamp;
import java.util.List;
@Data
public class BmProjectLot {
@ -125,6 +126,17 @@ public class BmProjectLot {
@ApiModelProperty(value = "工程类型名称")
private String typeName;
/** 导出选中列表 */
private List<Long> dataCondition;
public List<Long> getDataCondition() {
return dataCondition;
}
public void setDataCondition(List<Long> dataCondition) {
this.dataCondition = dataCondition;
}
public long getLotId() {
return lotId;
}

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

@ -4,6 +4,8 @@ package com.bonus.sgzb.base.domain;
import com.bonus.sgzb.common.core.annotation.Excel;
import lombok.Data;
import java.util.List;
@Data
public class MaPropInfo {
/**
@ -61,6 +63,19 @@ public class MaPropInfo {
@Excel(name = "所属上级")
private String deptName;
private String typeName;
/** 导出选中列表 */
private List<Long> dataCondition;
public List<Long> getDataCondition() {
return dataCondition;
}
public void setDataCondition(List<Long> dataCondition) {
this.dataCondition = dataCondition;
}
public long getPropId() {
return propId;
}

2
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/MaPropInfoMapper.java
View File

@ -56,7 +56,7 @@ public interface MaPropInfoMapper {
* @return
*/
List<MaPropSet> checkPropIdUnique(MaPropSet maPropSet);
List<MaType> selectMaType(String typeName);
List<MaType> selectMaType(MaPropInfo maPropInfo);
/**
* 删除资产项目
* @param propId

2
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/IMaPropInfoService.java
View File

@ -31,7 +31,7 @@ public interface IMaPropInfoService {
* @param
* @return
*/
List<MaType> selectMaType(String typeName);
List<MaType> selectMaType(MaPropInfo maPropInfo);
/**
* 校验资产项目名称唯一性
* @param maPropInfo

4
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaPropInfoServiceImpl.java
View File

@ -60,8 +60,8 @@ public class MaPropInfoServiceImpl implements IMaPropInfoService {
* @return
*/
@Override
public List<MaType> selectMaType(String typeName) {
return maPropInfoMapper.selectMaType(typeName);
public List<MaType> selectMaType(MaPropInfo maPropInfo) {
return maPropInfoMapper.selectMaType(maPropInfo);
}
/**

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

@ -79,6 +79,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="companyId != null and companyId != ''">
and a.company_id = #{companyId}
</if>
<if test="dataCondition != null and dataCondition.size()>0">
AND a.pro_id in
<foreach collection="dataCondition" item="proId" index="index" open="(" separator="," close=")">
#{proId}
</foreach>
</if>
ORDER BY a.pro_id DESC
</select>
<select id="getProjectLot" parameterType="com.bonus.sgzb.base.domain.BmProjectInfo" resultMap="BmProjectInfoResult">

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

@ -84,6 +84,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="companyId != null and companyId != ''">
and company_id = #{companyId}
</if>
<if test="dataCondition != null and dataCondition.size()>0">
AND a.lot_id in
<foreach collection="dataCondition" item="lotId" index="index" open="(" separator="," close=")">
#{lotId}
</foreach>
</if>
ORDER BY a.lot_id DESC
</select>
<select id="selectByName" resultType="com.bonus.sgzb.base.domain.BmProjectLot">

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

@ -93,6 +93,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="typeName != null and typeName !=''">
AND type_name like concat('%',#{typeName},'%')
</if>
<if test="dataCondition != null and dataCondition.size()>0">
AND m.type_id in
<foreach collection="dataCondition" item="typeId" index="index" open="(" separator="," close=")">
#{typeId}
</foreach>
</if>
</where>
</select>
@ -211,6 +217,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="propId != null and propId != ''">
AND a.prop_id = #{propId}
</if>
<if test="dataCondition != null and dataCondition.size()>0">
AND a.prop_id in
<foreach collection="dataCondition" item="propId" index="index" open="(" separator="," close=")">
#{propId}
</foreach>
</if>
</where>
</select>
<select id="selectMaPropSets" resultType="com.bonus.sgzb.base.domain.MaPropInfo" resultMap="MaPropInfoResult">

4
sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaintenanceGangMapper.xml
View File

@ -23,8 +23,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="getMaintenanceGangInfoAll" resultType="com.bonus.sgzb.base.domain.MaintenanceGang">
SELECT mt.type_id as modelId ,mt.type_name as modelName,
mt2.type_id, mt2.type_name,
mt3.type_id as typeId,mt3.type_name as typeName,
mt2.type_id, mt2.type_name as typeName,
mt3.type_id as typeId,mt3.type_name,
mt3.type_id as kindId,mt4.type_name as kindName,
su.user_id as userId, su.nick_name as userName
FROM ma_type mt