Browse Source

2025/6/16

master
Aoi_Tori 7 months ago
parent
commit
5dc7a6f92e
  1. 2
      src/main/java/com/spring/modules/proofing/mapper/ProofingInformationMapper.java
  2. 6
      src/main/java/com/spring/modules/proofing/service/impl/ProofingInformationServiceImpl.java
  3. 4
      src/main/java/com/spring/modules/quotation/service/impl/QuotationInformationServiceImpl.java
  4. 4
      src/main/java/com/spring/modules/test/service/impl/TestInformationServiceImpl.java
  5. 2
      src/main/resources/mapper/proofing/ProofingInformationMapper.xml

2
src/main/java/com/spring/modules/proofing/mapper/ProofingInformationMapper.java

@ -24,5 +24,5 @@ public interface ProofingInformationMapper extends BaseMapper<ProofingInformatio
List<ProofingDelegateAccessVo> searchDelegateAccessByUser(@Param("params") ProofingDelegateAccessVo delegateAccess,@Param("roleId")String roleId);
IPage<ProofingInformationVo> testInformationSearchByAnyField(Page<ProofingInformationVo> proofingInformationVoPage, @Param("query") Map<String, String> params);
IPage<ProofingInformationVo> proofingInformationSearchByAnyField(Page<ProofingInformationVo> proofingInformationVoPage, @Param("query") Map<String, String> params);
}

6
src/main/java/com/spring/modules/proofing/service/impl/ProofingInformationServiceImpl.java

@ -663,8 +663,8 @@ public class ProofingInformationServiceImpl extends ServiceImpl<ProofingInformat
for (int i = 0; i < whereConditionArr.length; i++) {
if (whereConditionArr[i].contains("create_by")) {
String formula = filteredList.get(i).getFormula();
// whereConditionArr[i] = "vpp.bu_no " + createBySymbol + " (select bu_No from dbo.Get_Now_BU_chooseAble(a.site, '"+ formula +"'))";
whereConditionArr[i] = "vpp.bu_no in (select bu_No from dbo.Get_Now_BU_chooseAble(a.site, '"+ formula +"'))";
whereConditionArr[i] = "vpp.bu_no " + createBySymbol + " (select bu_No from dbo.Get_Now_BU_chooseAble(a.site, '"+ formula +"'))";
// whereConditionArr[i] = "vpp.bu_no in (select bu_No from dbo.Get_Now_BU_chooseAble(a.site, '"+ formula +"'))";
}
}
whereClause = String.join(" AND ", whereConditionArr);
@ -675,7 +675,7 @@ public class ProofingInformationServiceImpl extends ServiceImpl<ProofingInformat
params.put("menuId", data.getMenuId());
params.put("whereClause", whereClause);
params.put("orderClause", orderClause);
IPage<ProofingInformationVo> resultList = proofingInformationMapper.testInformationSearchByAnyField(new Page<ProofingInformationVo>(data.getNo(), data.getSize()), params);
IPage<ProofingInformationVo> resultList = proofingInformationMapper.proofingInformationSearchByAnyField(new Page<ProofingInformationVo>(data.getNo(), data.getSize()), params);
return new PageUtils(resultList);
}

4
src/main/java/com/spring/modules/quotation/service/impl/QuotationInformationServiceImpl.java

@ -746,8 +746,8 @@ public class QuotationInformationServiceImpl extends ServiceImpl<QuotationInform
for (int i = 0; i < whereConditionArr.length; i++) {
if (whereConditionArr[i].contains("create_by") && !toBeQuoted) {
String formula = filteredList.get(i).getFormula();
// whereConditionArr[i] = "vpp.bu_no " + createBySymbol + " (select bu_No from dbo.Get_Now_BU_chooseAble(a.site, '"+ formula +"'))";
whereConditionArr[i] = "vpp.bu_no in (select bu_No from dbo.Get_Now_BU_chooseAble(a.site, '"+ formula +"'))";
whereConditionArr[i] = "vpp.bu_no " + createBySymbol + " (select bu_No from dbo.Get_Now_BU_chooseAble(a.site, '"+ formula +"'))";
// whereConditionArr[i] = "vpp.bu_no in (select bu_No from dbo.Get_Now_BU_chooseAble(a.site, '"+ formula +"'))";
}
}
whereClause = String.join(" AND ", whereConditionArr);

4
src/main/java/com/spring/modules/test/service/impl/TestInformationServiceImpl.java

@ -304,8 +304,8 @@ public class TestInformationServiceImpl extends ServiceImpl<TestInformationMappe
for (int i = 0; i < whereConditionArr.length; i++) {
if (whereConditionArr[i].contains("create_by")) {
String formula = filteredList.get(i).getFormula();
// whereConditionArr[i] = "vpp.bu_no " + createBySymbol + " (select bu_No from dbo.Get_Now_BU_chooseAble(a.site, '"+ formula +"'))";
whereConditionArr[i] = "vpp.bu_no in (select bu_No from dbo.Get_Now_BU_chooseAble(a.site, '"+ formula +"'))";
whereConditionArr[i] = "vpp.bu_no " + createBySymbol + " (select bu_No from dbo.Get_Now_BU_chooseAble(a.site, '"+ formula +"'))";
// whereConditionArr[i] = "vpp.bu_no in (select bu_No from dbo.Get_Now_BU_chooseAble(a.site, '"+ formula +"'))";
}
}
whereClause = String.join(" AND ", whereConditionArr);

2
src/main/resources/mapper/proofing/ProofingInformationMapper.xml

@ -185,7 +185,7 @@
and a.user_display like #{params.delegateAccessName}
</if>
</select>
<select id="testInformationSearchByAnyField"
<select id="proofingInformationSearchByAnyField"
resultType="com.spring.modules.proofing.vo.ProofingInformationVo">
SELECT a.id,
a.site,

Loading…
Cancel
Save