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

排序 资产属性

This commit is contained in:
gmhao 2023-12-19 10:09:47 +08:00
parent b6f46c6b4f
commit afdddd648d
4 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -94,8 +94,8 @@ public class MaPropInfoController extends BaseController {
}*/ }*/
Long fieldValue =maPropSet.getTypeId(); Long fieldValue =maPropSet.getTypeId();
Long fieldValues =maPropSet.getPropId(); Long fieldValues =maPropSet.getPropId();
if ( fieldValue != null || fieldValues !=null){ if (maPropSet.getPropName() != null){
return toAjax(maPropInfoService.insertMaPropSet(maPropSet)); return toAjax(maPropInfoService.updateMaPropSet(maPropSet));
} }
/*List<MaPropSet> ben= maPropInfoService.checkPropIdUnique(maPropSet); /*List<MaPropSet> ben= maPropInfoService.checkPropIdUnique(maPropSet);
for (MaPropSet s:ben) { for (MaPropSet s:ben) {
@ -105,7 +105,8 @@ public class MaPropInfoController extends BaseController {
} }
}*/ }*/
return toAjax(maPropInfoService.updateMaPropSet(maPropSet)); return toAjax(maPropInfoService.insertMaPropSet(maPropSet));
} }
/** /**

2
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/MaPropSet.java
View File

@ -49,5 +49,5 @@ public class MaPropSet {
*/ */
private String companyId; private String companyId;
private String propName;
} }

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

@ -79,6 +79,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="companyId != null and companyId != ''"> <if test="companyId != null and companyId != ''">
and a.company_id = #{companyId} and a.company_id = #{companyId}
</if> </if>
ORDER BY a.pro_id DESC
</select> </select>
<select id="getProjectLot" parameterType="com.bonus.sgzb.base.domain.BmProjectInfo" resultMap="BmProjectInfoResult"> <select id="getProjectLot" parameterType="com.bonus.sgzb.base.domain.BmProjectInfo" resultMap="BmProjectInfoResult">
<!--<include refid="bmProjectInfo"/>--> <!--<include refid="bmProjectInfo"/>-->

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

@ -84,6 +84,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="companyId != null and companyId != ''"> <if test="companyId != null and companyId != ''">
and company_id = #{companyId} and company_id = #{companyId}
</if> </if>
ORDER BY a.lot_id DESC
</select> </select>
<insert id="projectLotAdd" parameterType="com.bonus.sgzb.base.domain.BmProjectLot"> <insert id="projectLotAdd" parameterType="com.bonus.sgzb.base.domain.BmProjectLot">
insert into bm_project_lot ( insert into bm_project_lot (