igds-core/src/main/java/com/ld/igds/m/view/QualityManager.view.xml
@@ -683,8 +683,6 @@ if(item == 1)metrics+="1:质量指标检验#";
 if(item == 2)metrics+="2:储存品质检验#";
 if(item == 3)metrics+="3:食品安全检验#";
 console.log(item)
 console.log(metrics) 
 });
 data.set("zblb", metrics.substring(0,metrics.length-1));
 }</ClientEvent> igds-manager/src/main/java/com/ld/igds/models/DeptDevice.java
@@ -4,12 +4,10 @@ import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.Table; import javax.persistence.*; import java.io.Serializable; import java.util.Date; import java.util.List; /** * 设备信息 @@ -90,4 +88,9 @@ @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8") private Date updateTime; /** * 检修记录 */ @Transient private List<DeviceCheckup> checkupList; } igds-manager/src/main/java/com/ld/igds/models/DeviceCheckup.java
@@ -66,6 +66,14 @@ @Column(name = "jddw", length = 256) private String jddw; @PropertyDef(label = "检定结果") @Column(name = "jdjg", length = 10) private String jdjg; @PropertyDef(label = "备注") @Column(name = "remark", length = 500) private String remark; @PropertyDef(label = "最后更新时间") @JSONField(format = "yyyy-MM-dd HH:mm:ss") @Column(name = "zhgxsj") igds-manager/src/main/java/com/ld/igds/models/OAArchives.java
@@ -2,12 +2,11 @@ import java.io.Serializable; import java.util.Date; import java.util.List; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.Table; import javax.persistence.*; import com.ld.igds.file.dto.FileData; import lombok.Data; import com.bstek.dorado.annotation.PropertyDef; @@ -19,7 +18,6 @@ * @description: * @version: * @data:2020年5月30日 * */ @Data @Entity @@ -81,4 +79,7 @@ @PropertyDef(label = "备注") private String remark; @Transient private List<FileInfo> fileData; } 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()); } igds-manager/src/main/java/com/ld/igds/oa/service/HOfficeAutoService.java
@@ -327,7 +327,7 @@ this.pagingQuery(page, hql, count, args); } public void saveArchives(OAArchives data) { public String saveArchives(OAArchives data) { if (null == data.getCompanyId()) { data.setCompanyId(ContextUtil.getCompanyId()); } @@ -347,6 +347,7 @@ session.flush(); session.close(); } return data.getId(); } public String delArchives(OAArchives data) { igds-manager/src/main/java/com/ld/igds/oa/view/Archives.view.xml
@@ -69,6 +69,11 @@ <Property></Property> <Property name="label">备注</Property> </PropertyDef> <Reference name="fileData"> <Property name="dataProvider">sys.fileManager#listFile</Property> <Property name="dataType">[dtFileData]</Property> <Property name="parameter">$${this.id}</Property> </Reference> </DataType> <DataType name="dtParam"> <PropertyDef name="name"> @@ -93,11 +98,36 @@ <View layout="padding:5;regionPadding:5"> <ClientEvent name="onReady">
 view.get("#dsParam").insert({});
 
 addMain = function(){
 view.get("#dsMain").insert({
 });
 view.get("#dsMain").insert({});
 view.get("#dialogMain").show();
 }
 //附件下载
 downLodFile = function(){
 var entity = view.get("#dgFiles").getCurrentItem();
 view.get("#downloadFile").set("parameter",{
 fileId:entity.get("fileId"),
 fileName:entity.get("fileName"),
 createTime:entity.get("createTime")
 }).execute();
 }
 
 
 //删除附件
 delFile = function(){
 var entity = view.get("#dgFiles").getCurrentItem();
 view.get("#ajaxDelFile").set("parameter",{
 fileId:entity.get("fileId"),
 fileName:entity.get("fileName"),
 createTime:entity.get("createTime")
 }).execute(function(result){
 if(result){
 $alert(result);
 }else{
 entity.remove();
 $alert("删除成功！");
 }
 });
 }</ClientEvent> <Property name="packages">font-awesome,css-common</Property> <DataSet id="dsMain"> @@ -247,7 +277,6 @@ </DataPilot> </Container> <Dialog id="dialogMain" layout="padding:5;regionPadding:10"> <Property name="height">500</Property> <Property name="width">85%</Property> <Property name="caption">档案信息</Property> <Property name="iconClass">fa fa-flag-o</Property> @@ -274,6 +303,10 @@ <Property name="width">90</Property> </Button> </Buttons> <Children> <FieldSet layout="regionPadding:10"> <Property name="caption">基础信息</Property> <Buttons/> <Children> <AutoForm> <Property name="dataSet">dsMain</Property> @@ -325,6 +358,74 @@ </AutoFormElement> </AutoForm> </Children> </FieldSet> <FieldSet layout="regionPadding:10"> <Property name="caption">上传附件</Property> <Property name="height">200</Property> <Buttons> <Button id="addFile"> <Property name="caption">添加附件</Property> <Property name="exClassName">btn-default</Property> <Property name="iconClass">fa fa-cloud-upload</Property> <Property name="action">uploadFile</Property> </Button> </Buttons> <Children> <DataGrid id="dgFiles"> <ClientEvent name="onDataRowClick">view.get("#dgFiles").set("selection",arg.data);</ClientEvent> <Property name="dataPath">#.fileData</Property> <Property name="dataSet">dsMain</Property> <Property name="readOnly">true</Property> <Property name="selectionMode">singleRow</Property> <RowNumColumn/> <RowSelectorColumn/> <DataColumn name="fileName"> <Property name="property">fileName</Property> </DataColumn> <DataColumn name="createTime"> <Property name="property">createTime</Property> <Property name="align">center</Property> </DataColumn> <DataColumn name="fileId"> <ClientEvent name="onRenderCell">arg.dom.innerHTML = "<a href='javascript:;' onClick='downLodFile()'>下载</a>&nbsp;&nbsp;|&nbsp;&nbsp;<a href='javascript:;' onClick='delFile()'>删除</a>";
 </ClientEvent> <Property name="property">fileId</Property> <Property name="align">center</Property> <Property name="caption">操作</Property> <Property name="readOnly">true</Property> <Property name="width">90</Property> </DataColumn> </DataGrid> <UploadAction id="uploadFile"> <ClientEvent name="onFileUploaded">var files = view.get("#dsMain.data:#").get("fileData");
 if(files.entityCount>=1){
 $alert("只能上传一个附件")
 return;
 }else{
 //附件上传完成后添加业务数据
 var mainData = view.get("#dsMain.data:#");
 var fileId = arg.returnValue;
 var files = view.get("#dsMain.data:#").get("fileData");
 files.insert({fileId:fileId,fileName:arg.file.name,createTime:new Date()});
 }
 </ClientEvent> <Property name="fileResolver">applyOrderUploadProcessor#uploadApplyOrderFile</Property> <Property name="maxFileSize">50MB</Property> <Property name="successMessage">附件上传成功！！</Property> <Filters/> </UploadAction> <DownloadAction id="downloadFile"> <Property name="caption">下载附件</Property> <Property name="fileProvider">applyOrderUploadProcessor#downloadApplyOrderFile</Property> <Property name="successMessage">附件下载成功！</Property> </DownloadAction> <AjaxAction id="ajaxDelFile"> <Property name="confirmMessage">确定要删除么？</Property> <Property name="service">applyOrderUploadProcessor#delFile</Property> </AjaxAction> </Children> </FieldSet> </Children> <Tools/> </Dialog> <UpdateAction id="uaAction"> igds-manager/src/main/java/com/ld/igds/oa/view/DeptDevice.view.xml
@@ -96,6 +96,7 @@ <PropertyDef name="updateTime"> <Property name="dataType">Date</Property> <Property name="label">更新时间</Property> <Property name="readOnly">true</Property> </PropertyDef> </DataType> <DataType name="dtParam"> @@ -114,34 +115,34 @@ <DataType name="dtCheck"> <Property name="creationType">com.ld.igds.models.DeviceCheckup</Property> <PropertyDef name="id"> <Property/> <Property></Property> </PropertyDef> <PropertyDef name="companyId"> <Property/> <Property></Property> <Property name="label">组织编码</Property> </PropertyDef> <PropertyDef name="sbbh"> <Property/> <Property></Property> <Property name="label">设备编号</Property> </PropertyDef> <PropertyDef name="kqdm"> <Property/> <Property></Property> <Property name="label">库区代码</Property> </PropertyDef> <PropertyDef name="kqmc"> <Property/> <Property></Property> <Property name="label">库区名称</Property> </PropertyDef> <PropertyDef name="dwdm"> <Property/> <Property></Property> <Property name="label">单位代码</Property> </PropertyDef> <PropertyDef name="sbyqmc"> <Property/> <Property></Property> <Property name="label">设备仪器名称</Property> </PropertyDef> <PropertyDef name="sbyqdm"> <Property/> <Property></Property> <Property name="label">设备仪器代码</Property> </PropertyDef> <PropertyDef name="jdsj"> @@ -149,7 +150,7 @@ <Property name="label">检定时间</Property> </PropertyDef> <PropertyDef name="jddw"> <Property/> <Property></Property> <Property name="label">检定单位</Property> </PropertyDef> <PropertyDef name="zhgxsj"> igds-manager/src/main/java/com/ld/igds/oa/view/DeptDevicePR.java
@@ -75,6 +75,17 @@ } /** * deptDevicePR#listCheck * * @param param * @throws Exception */ @DataProvider public void listCheck(Map<String, Object> param) throws Exception { deptDeviceService.listCheck(param); } /** * deptDevicePR#delCheck * * @param data igds-manager/src/main/java/com/ld/igds/oa/view/DeviceCheckup.view.xml
@@ -6,34 +6,34 @@ <DataType name="dtMain"> <Property name="creationType">com.ld.igds.models.DeviceCheckup</Property> <PropertyDef name="id"> <Property/> <Property></Property> </PropertyDef> <PropertyDef name="companyId"> <Property/> <Property></Property> <Property name="label">组织编码</Property> </PropertyDef> <PropertyDef name="sbbh"> <Property/> <Property></Property> <Property name="label">设备编号</Property> </PropertyDef> <PropertyDef name="kqdm"> <Property/> <Property></Property> <Property name="label">库区代码</Property> </PropertyDef> <PropertyDef name="kqmc"> <Property/> <Property></Property> <Property name="label">库区名称</Property> </PropertyDef> <PropertyDef name="dwdm"> <Property/> <Property></Property> <Property name="label">单位代码</Property> </PropertyDef> <PropertyDef name="sbyqmc"> <Property/> <Property></Property> <Property name="label">设备仪器名称</Property> </PropertyDef> <PropertyDef name="sbyqdm"> <Property/> <Property></Property> <Property name="label">设备仪器代码</Property> </PropertyDef> <PropertyDef name="jdsj"> @@ -41,12 +41,21 @@ <Property name="label">检定时间</Property> </PropertyDef> <PropertyDef name="jddw"> <Property/> <Property></Property> <Property name="label">检定单位</Property> </PropertyDef> <PropertyDef name="zhgxsj"> <Property name="dataType">Date</Property> <Property name="label">最后更新时间</Property> <Property name="readOnly">true</Property> </PropertyDef> <PropertyDef name="jdjg"> <Property/> <Property name="label">检定结果</Property> </PropertyDef> <PropertyDef name="remark"> <Property/> <Property name="label">备注</Property> </PropertyDef> </DataType> <DataType name="dtParam"> @@ -63,7 +72,7 @@ </PropertyDef> </DataType> </Model> <View> <View layout="regionPadding:10"> <ClientEvent name="onReady">view.get("#dsParam").insert({});</ClientEvent> <Property name="packages">font-awesome,css-common</Property> <DataSet id="dsMain"> @@ -157,49 +166,50 @@ <RowNumColumn> <Property name="caption">序号</Property> </RowNumColumn> <DataColumn name="id"> <Property name="property">id</Property> <Property name="align">center</Property> </DataColumn> <DataColumn name="companyId"> <Property name="property">companyId</Property> <Property name="align">center</Property> </DataColumn> <DataColumn name="sbbh"> <Property name="property">sbbh</Property> <Property name="align">center</Property> <Property name="readOnly">true</Property> </DataColumn> <DataColumn name="kqdm"> <Property name="property">kqdm</Property> <Property name="align">center</Property> <Property name="readOnly">true</Property> </DataColumn> <DataColumn name="kqmc"> <Property name="property">kqmc</Property> <Property name="align">center</Property> <Property name="readOnly">true</Property> </DataColumn> <DataColumn name="dwdm"> <Property name="property">dwdm</Property> <Property name="align">center</Property> <Property name="readOnly">true</Property> </DataColumn> <DataColumn name="sbyqmc"> <Property name="property">sbyqmc</Property> <Property name="align">center</Property> <Property name="readOnly">true</Property> </DataColumn> <DataColumn name="sbyqdm"> <Property name="property">sbyqdm</Property> <Property name="align">center</Property> <Property name="readOnly">true</Property> </DataColumn> <DataColumn name="jdsj"> <Property name="property">jdsj</Property> <Property name="align">center</Property> <Property name="readOnly">true</Property> </DataColumn> <DataColumn name="jddw"> <Property name="property">jddw</Property> <Property name="align">center</Property> <Property name="readOnly">true</Property> </DataColumn> <DataColumn name="zhgxsj"> <Property name="property">zhgxsj</Property> <Property name="align">center</Property> <Property name="readOnly">true</Property> </DataColumn> </DataGrid> </Container> @@ -243,16 +253,6 @@ <Property name="labelSeparator">：</Property> <Property name="labelWidth">150</Property> <AutoFormElement> <Property name="name">id</Property> <Property name="property">id</Property> <Editor/> </AutoFormElement> <AutoFormElement> <Property name="name">companyId</Property> <Property name="property">companyId</Property> <Editor/> </AutoFormElement> <AutoFormElement> <Property name="name">sbbh</Property> <Property name="property">sbbh</Property> <Editor/> @@ -293,6 +293,17 @@ <Editor/> </AutoFormElement> <AutoFormElement> <Property name="name">jdjg</Property> <Property name="property">jdjg</Property> <Property name="trigger">listDropYN</Property> <Editor/> </AutoFormElement> <AutoFormElement> <Property name="name">remark</Property> <Property name="property">remark</Property> <Editor/> </AutoFormElement> <AutoFormElement> <Property name="name">zhgxsj</Property> <Property name="property">zhgxsj</Property> <Editor/> @@ -313,5 +324,8 @@ <Property name="service">deptDevicePR#delCheck</Property> <Property name="confirmMessage">确定要执行删除么？</Property> </AjaxAction> <ListDropDown id="listDropYN"> <Property name="items">合格,不合格</Property> </ListDropDown> </View> </ViewConfig> igds-manager/src/main/java/com/ld/igds/oa/view/OfficeAutoPR.java
@@ -5,6 +5,7 @@ import java.util.List; import java.util.Map; import com.ld.igds.file.CoreFileService; import com.ld.igds.models.*; import org.springframework.beans.factory.annotation.Autowired; @@ -25,7 +26,6 @@ * @description: * @version: * @data:2020年5月29日 * */ @Component("oaPR") public class OfficeAutoPR { @@ -35,6 +35,9 @@ @Autowired private GpsConfManager gpsConfManager; @Autowired private CoreFileService fileService; // =====================考勤管理=====================// @@ -188,7 +191,11 @@ */ @DataResolver public void saveArchives(OAArchives data) { service.saveArchives(data); String orderId = service.saveArchives(data); // 附件 List<FileInfo> files = data.getFileData(); fileService.saveFiles(files, orderId, null); } /** @@ -240,7 +247,7 @@ /** * oaPR#queryLocation * * <p> * 查询设备位置 * * @param data igds-recir/src/main/java/com/ld/igds/drug/service/HDrugLogApplyService.java
@@ -73,7 +73,7 @@ } else { session.update(data); } if (CollectionUtils.isEmpty(data.getDrugLogPeople())) { if (!CollectionUtils.isEmpty(data.getDrugLogPeople())) { for (DrugLogPeople drugLogPeople : data.getDrugLogPeople()) { if (null == drugLogPeople.getId()) { drugLogPeople.setId(ContextUtil.getUUID());
