Просмотр исходного кода

통계 => 상품별 주문 정상이월 체크박스 추가

LMC 4 лет назад
Родитель
Сommit
4dd433d2a4

+ 4 - 0
src/main/java/com/style24/admin/biz/web/TsaStatisticsController.java

@@ -202,6 +202,10 @@ public class TsaStatisticsController extends TsaBaseController {
 			statistics.setMultiGoodsCd(statistics.getGoodsCd().split(System.lineSeparator()));
 		}
 
+		if (!StringUtils.isBlank(statistics.getFormalGb())) {
+			statistics.setMultiFrontGb(statistics.getExtmallIdList().split(","));
+		}
+
 		return statisticsService.getGoodsOrderList(statistics);
 	}
 

+ 3 - 0
src/main/java/com/style24/persistence/domain/Statistics.java

@@ -50,6 +50,9 @@ public class Statistics extends TscBaseDomain {
 	@JsonFormat(with = JsonFormat.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY)
 	private String[] multiExtmallId;	// 제휴몰ID
 
+	@JsonFormat(with = JsonFormat.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY)
+	private String[] multiFormalGb;	// 제휴몰ID
+
 	private String distributionGbWms;	// 유통구분(WMS)
 	private String distributionGbScm;	// 유통구분(SCM)
 

+ 4 - 0
src/main/java/com/style24/persistence/mybatis/shop/TsaStatistics.xml

@@ -409,6 +409,10 @@
 			/* 상품코드 */
 			<foreach collection="multiGoodsCd" item="item" index="index"  open="AND (" close=")" separator="OR">A.GOODS_CD LIKE CONCAT('%', #{item}, '%')</foreach>
 		</if>
+		<if test="multiFormalGb != null">
+			/* 정상/이월구분 */
+			<foreach collection="multiFormalGb" item="item" index="index"  open="AND B.FORMAL_GB IN (" close=")" separator=",">#{item}</foreach>
+		</if>
 		GROUP BY A.FORMAL_GB, A.GOODS_CD, B.GOODS_NM, B.SELF_GOODS_YN
 		ORDER BY B.SELF_GOODS_YN DESC, A.FORMAL_GB, A.GOODS_CD
 	</select>

+ 1 - 1
src/main/webapp/WEB-INF/views/statistics/GoodsTradingForm.html

@@ -69,7 +69,7 @@
 						</td>
 						<th>정상/이월구분</th>
 						<td>
-							<label th:if="${formalGbList}" th:each="oneData, status : ${formalGbList}" class="chkBox checked"><input type="checkbox" name="multiDistributionGb" th:value="${oneData.cd}" th:text="${'[' + oneData.cd + '] ' + oneData.cdNm}" checked="checked"/>위탁</label>
+							<label th:if="${formalGbList}" th:each="oneData, status : ${formalGbList}" class="chkBox checked"><input type="checkbox" name="multiFormalGb" th:value="${oneData.cd}" th:text="${'[' + oneData.cd + '] ' + oneData.cdNm}" checked="checked"/></label>
 						</td>
 					</tr>
 					<tr>