dianliang/lanan-system
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复检测相关

Browse Source
This commit is contained in:
13405411873 2024-10-15 10:34:05 +08:00
parent bab7f9f22e
commit af1be4cb26
3 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/PartnerOwnController.java
View File

@ -84,9 +84,9 @@ public class PartnerOwnController extends BaseController {
* 首页 顶部数据统计 * 首页 顶部数据统计
*/ */
@GetMapping("/statisticsInfo") @GetMapping("/statisticsInfo")
public CommonResult statisticsInfo(Long partnerId) public CommonResult statisticsInfo()
{ {
return success(partnerList.statisticsInfo(partnerId)); return success(partnerList.statisticsInfo(null));
} }
/** /**
* 检测线图 * 检测线图

4
dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/AppInspectionPartnerServiceImpl.java
View File

@ -234,10 +234,6 @@ public class AppInspectionPartnerServiceImpl extends ServiceImpl<AppInspectionPa
@Override @Override
public StatisticsInfo statisticsInfo(Long partnerId) { public StatisticsInfo statisticsInfo(Long partnerId) {
LoginUser user = SecurityFrameworkUtils.getLoginUser(); LoginUser user = SecurityFrameworkUtils.getLoginUser();
ShopMallPartners partners = baseMapper.selectById(partnerId);
if (!partners.getUserId().equals(user.getId())){
return null;
}
StatisticsInfo statisticsInfo2 = baseMapper.orderNum(partnerId, DateUtil.format(new Date(),"yyyy-MM-dd")); StatisticsInfo statisticsInfo2 = baseMapper.orderNum(partnerId, DateUtil.format(new Date(),"yyyy-MM-dd"));
//合规且合格双燃料 //合规且合格双燃料
Integer i = baseMapper.srlNum(partnerId, DateUtil.format(new Date(), "yyyy-MM-dd")); Integer i = baseMapper.srlNum(partnerId, DateUtil.format(new Date(), "yyyy-MM-dd"));

4
dl-module-inspection/src/main/resources/mapper/inspection/AppInspectionPartnerMapper.xml
View File

@ -91,7 +91,7 @@
FROM FROM
inspection_info info inspection_info info
INNER JOIN order_info oi ON info.inspection_order_id = oi.id INNER JOIN order_info oi ON info.inspection_order_id = oi.id
WHERE oi.partner_id = #{partnerId} and info.end_time like CONCAT(#{timeStr},'%') WHERE info.end_time like CONCAT(#{timeStr},'%')
and info.is_pass ='1' and oi.goods_title like concat('%','双燃料','%') and info.is_pass ='1' and oi.goods_title like concat('%','双燃料','%')
</select> </select>
<select id="hgNum" resultType="java.lang.Integer"> <select id="hgNum" resultType="java.lang.Integer">
@ -100,7 +100,7 @@
FROM FROM
inspection_info info inspection_info info
INNER JOIN order_info oi ON info.inspection_order_id = oi.id INNER JOIN order_info oi ON info.inspection_order_id = oi.id
WHERE oi.partner_id = #{partnerId} and info.end_time like CONCAT(#{timeStr},'%') WHERE info.end_time like CONCAT(#{timeStr},'%')
and info.is_pass ='1' and info.is_pass ='1'
</select> </select>
<select id="orderNum" resultType="cn.iocoder.yudao.module.inspection.vo.StatisticsInfo"> <select id="orderNum" resultType="cn.iocoder.yudao.module.inspection.vo.StatisticsInfo">