Merge remote-tracking branch 'origin/master'

jiazx0107@163.com

2023-08-12 a673b25a0bc23b3b8b914088bdb7dca3d2e89d45

 igds-manager/src/main/java/com/ld/igds/oa/service/HDeptDeviceService.java

@@ -9,9 +9,11 @@
import org.apache.commons.lang3.StringUtils;
import org.hibernate.Session;
import org.springframework.stereotype.Component;
import org.springframework.util.CollectionUtils;

import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

/**
@@ -46,10 +48,23 @@
        Session session = this.getSessionFactory().openSession();
        try {
            data.setCompanyId(ContextUtil.getCompanyId());
            data.setUpdateTime(new Date());
            if (null == data.getId()) {
                data.setId(ContextUtil.getUUID());
            }
            session.saveOrUpdate(data);
//            if (!CollectionUtils.isEmpty(data.getCheckupList())) {
//                for (DeviceCheckup item : data.getCheckupList()) {
//                    if (null == item.getId()) {
//                        item.setCompanyId(ContextUtil.getCompanyId());
//                        item.setId(ContextUtil.getCompanyId());
//                        item.setSbbh(data.getSbbh());
//                        item.setSbyqdm(data.getSbyqdm());
//                        item.setSbyqmc(data.getSbyqmc());
//                    }
//                    session.saveOrUpdate(item);
//                }
//            }
        } finally {
            session.flush();
            session.close();
@@ -88,11 +103,27 @@

    }

    public List<DeviceCheckup> listCheck(Map<String, Object> param) throws Exception {
        String hql = " from " + DeviceCheckup.class.getName() + " where companyId=:companyId";

        Map<String, Object> args = new HashMap<>();
        args.put("companyId", ContextUtil.getCompanyId());

        if (null != param) {
            hql = buildHql(hql, param, args);
        }

        hql += " order by jdsj desc";

        return this.query(hql, args);
    }

    public String saveCheck(DeviceCheckup data) {

        Session session = this.getSessionFactory().openSession();
        try {
            data.setCompanyId(ContextUtil.getCompanyId());
            data.setZhgxsj(new Date());
            if (null == data.getId()) {
                data.setId(ContextUtil.getUUID());
            }