熏蒸备案页面修改2

YYC

2023-10-09 841757844cdadd49ae6f2bc7bdb9c753d7b52972

熏蒸备案页面修改2

 igds-recir/src/main/java/com/ld/igds/drug/service/HDrugLogApplyService.java

@@ -1,5 +1,6 @@
package com.ld.igds.drug.service;

import com.bstek.bdf2.core.model.RoleMember;
import com.bstek.bdf2.core.orm.hibernate.HibernateDao;
import com.bstek.dorado.data.provider.Page;
import com.ld.igds.constant.RedisConst;
@@ -8,6 +9,7 @@
import com.ld.igds.util.RedisUtil;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.time.DateFormatUtils;
import org.hibernate.Query;
import org.hibernate.Session;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -95,7 +97,7 @@
            session.saveOrUpdate(way);
            DrugLogDtl dtl = new DrugLogDtl();
            BeanUtils.copyProperties(data, dtl);
            way.setDrugLogId(data.getXzbm());
            dtl.setDrugLogId(data.getXzbm());
            session.saveOrUpdate(dtl);
        } catch (Exception e) {
            e.printStackTrace();
@@ -104,41 +106,6 @@
            session.close();
        }
        return null;
    }

    private void saveWay(DrugLogApply data) {
        Session session = this.getSessionFactory().openSession();

        try {
            DrugLogWay way = new DrugLogWay();
            BeanUtils.copyProperties(data, way);
            way.setWayId(ContextUtil.getUUID());
            session.saveOrUpdate(way);
        } catch (Exception e) {
            e.printStackTrace();
        } finally {
            session.flush();
            session.close();
        }
    }

    /**
     * 根据主表信息添加粮情字表
     *
     * @param data
     */
    private void saveDtl(DrugLogApply data) {
        Session session = this.getSessionFactory().openSession();
        try {
            DrugLogDtl dtl = new DrugLogDtl();
            BeanUtils.copyProperties(data, dtl);
            session.saveOrUpdate(dtl);
        } catch (Exception e) {
            e.printStackTrace();
        } finally {
            session.flush();
            session.close();
        }
    }

    /**
@@ -152,9 +119,20 @@
        try {
            if (null != data.getXzbm()) {
                session.delete(data);
                for (DrugLogPeople drugLogPeople : data.getDrugLogPeople()) {
                    session.delete(drugLogPeople);
                }
                String hqlPeople = "delete from " + DrugLogPeople.class.getName() + " where DRUG_LOG_ID_=:drugLogId";
                Query queryPeople = session.createQuery(hqlPeople);
                queryPeople.setString("drugLogId", data.getXzbm());
                queryPeople.executeUpdate();

                String hqlDtl = "delete from " + DrugLogDtl.class.getName() + " where DRUG_LOG_ID_=:drugLogId";
                Query queryDtl = session.createQuery(hqlDtl);
                queryDtl.setString("drugLogId", data.getXzbm());
                queryDtl.executeUpdate();

                String hqlWay = "delete from " + DrugLogWay.class.getName() + " where DRUG_LOG_ID_=:drugLogId";
                Query queryWay = session.createQuery(hqlWay);
                queryWay.setString("drugLogId", data.getXzbm());
                queryWay.executeUpdate();
            }
        } catch (Exception e) {
            e.printStackTrace();
@@ -257,13 +235,9 @@
        Map<String, Object> args = new HashMap<>();

        if (null != param) {

            String xzbm = (String) param.get("xzbm");
            String deptId = (String) param.get("deptId");
            String tbrq = DateFormatUtils.format((Date) param.get("tbrq"), "yyyyMMdd");
            String id = xzbm + deptId + tbrq;
            hql.append(" from " + DrugLogPeople.class.getName() + " where id=:id");
            args.put("id", id);
            hql.append(" from " + DrugLogPeople.class.getName() + " where DRUG_LOG_ID_=:id");
            args.put("id", xzbm);
            buildHql(hql, param, args);
        }
        return this.query(String.valueOf(hql), args);

 igds-recir/src/main/java/com/ld/igds/drug/view/DrugLogApply.view.xml

@@ -25,7 +25,7 @@
      <PropertyDef name="dwdm">
        <Property></Property>
        <Property name="label">单位代码</Property>
        <Property name="required">true</Property>
        <Property name="required">false</Property>
      </PropertyDef>
      <PropertyDef name="sqxzrq">
        <Property name="dataType">Date</Property>
@@ -214,6 +214,11 @@
        <Property name="displayFormat">#0.000℃</Property>
        <Property name="required">true</Property>
      </PropertyDef>
      <PropertyDef name="cw">
        <Property name="dataType">Double</Property>
        <Property name="label">仓温</Property>
        <Property name="displayFormat">#0.000℃</Property>
      </PropertyDef>
      <PropertyDef name="cnsd">
        <Property name="dataType">Double</Property>
        <Property name="label">仓内湿度</Property>
@@ -385,11 +390,17 @@
        <Property name="parameter">
          <Entity>
            <Property name="xzbm">$${this.xzbm}</Property>
            <Property name="deptId">$${this.deptId}</Property>
            <Property name="tbrq">$${this.tbrq}</Property>
          </Entity>
        </Property>
      </Reference>
      <PropertyDef name="dtlId">
        <Property/>
        <Property name="label">dtlId</Property>
      </PropertyDef>
      <PropertyDef name="wayId">
        <Property/>
        <Property name="label">wayId</Property>
      </PropertyDef>
    </DataType>
    <DataType name="dtPeople">
      <Property name="creationType">com.ld.igds.models.DrugLogPeople</Property>
@@ -913,6 +924,11 @@
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">lqsj</Property>
                <Property name="property">lqsj</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">updateTime</Property>
                <Property name="property">updateTime</Property>
                <Editor/>
@@ -995,6 +1011,11 @@
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">cw</Property>
                <Property name="property">cw</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">cnsd</Property>
                <Property name="property">cnsd</Property>
                <Editor/>

 igds-recir/src/main/java/com/ld/igds/models/DrugLogApply.java

@@ -189,6 +189,10 @@
    @Column(name = "lw", precision = 20, scale = 3)
    @PropertyDef(label = "粮温")
    private Double lw;
    
    @Column(name = "cw", precision = 20, scale = 3)
    @PropertyDef(label = "仓温")
    private Double cw;

    @Column(name = "cnsd", precision = 20, scale = 3)
    @PropertyDef(label = "仓内湿度")