Merge remote-tracking branch 'origin/master'

Houjie

8 天以前 b441d4a71dd43bf7fb12bfa62938ccd3020878b5

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamInspectionOrderServiceImpl.java

@@ -56,6 +56,7 @@
import org.jeecg.modules.system.service.impl.ThirdAppWechatEnterpriseServiceImpl;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

@@ -105,6 +106,9 @@
    private ISysUserService sysUserService;
    @Autowired
    private HistoryService historyService;

    @Value("${wechatEnterprise.cardActionUrl}")
    private String cardActionUrl;

    @Override
    public IPage<EamInspectionOrder> queryPageList(Page<EamInspectionOrder> page, EamInspectionOrderQuery query) {
@@ -188,6 +192,11 @@
            return Collections.emptyList();
        }
        return list;
    }

    @Override
    public List<EamInspectionOrder> selectUnReceivedInspectionOrder() {
        return this.baseMapper.selectUnReceivedInspectionOrder();
    }

    @Override
@@ -385,7 +394,7 @@

        TemplateCardEntity.CardAction cardAction = new TemplateCardEntity.CardAction();
        cardAction.setType(1);
        cardAction.setUrl("http://houjie.xalxzn.com:8866/h5");
        cardAction.setUrl(cardActionUrl);
        templateCardEntity.setCard_action(cardAction);

        wechatEnterpriseService.sendTemplateCardMsg(templateCard, true);