yili/apps
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

评论修复

Browse Source
This commit is contained in:
zhal 2022-09-15 23:14:01 +08:00
parent 88bd2336ee
commit 66ec529a15
3 changed files with 41 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
com.actionsoft.apps.coe.pal/lib/com.actionsoft.apps.coe.pal.jar
View File

Binary file not shown.

50
com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/web/CoeProcessLevelWeb.java
View File

@ -112,6 +112,7 @@ import com.google.common.collect.Lists;
import com.google.common.collect.Maps; import com.google.common.collect.Maps;
import org.apache.commons.collections.CollectionUtils; import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang.text.StrBuilder;
import org.apache.poi.hssf.usermodel.*; import org.apache.poi.hssf.usermodel.*;
import org.apache.poi.poifs.filesystem.POIFSFileSystem; import org.apache.poi.poifs.filesystem.POIFSFileSystem;
import org.apache.poi.ss.usermodel.HorizontalAlignment; import org.apache.poi.ss.usermodel.HorizontalAlignment;
@ -9004,9 +9005,10 @@ public class CoeProcessLevelWeb extends ActionWeb {
StringBuffer sb1=new StringBuffer(); StringBuffer sb1=new StringBuffer();
StringBuffer sb2=new StringBuffer(); StringBuffer sb2=new StringBuffer();
StringBuffer sb3=new StringBuffer(); StringBuffer sb3=new StringBuffer();
StringBuffer sb4 = new StringBuffer();;
sb.append("<span>质量校验<span><br/>"); sb.append("<span>质量校验<span><br/>");
sb1.append("<span>文件属性:<span>"); sb1.append("<span>文件属性:<span>");
sb2.append("<span>节点名称:<span>"); //sb2.append("<span>节点名称:<span>");
for (PALRepositoryPropertyModel property : propertys) { for (PALRepositoryPropertyModel property : propertys) {
String id = property.getPropertyId(); String id = property.getPropertyId();
@ -9024,9 +9026,9 @@ public class CoeProcessLevelWeb extends ActionWeb {
if (list == null || list.isEmpty()) { if (list == null || list.isEmpty()) {
flag1 = false; flag1 = false;
} }
} /*else { } else {
flag1 = UtilString.isNotEmpty(property.getPropertyValue()); flag1 = UtilString.isNotEmpty(property.getPropertyValue());
}*/ }
if (!flag1) {// 校验不通过 if (!flag1) {// 校验不通过
sb1.append("''"+attributeModel.getTitle()+"''").append(","); sb1.append("''"+attributeModel.getTitle()+"''").append(",");
flag1 = false; flag1 = false;
@ -9050,10 +9052,15 @@ public class CoeProcessLevelWeb extends ActionWeb {
String shapeCategory = o.getString("category"); String shapeCategory = o.getString("category");
JSONObject dataAttributes = o.getJSONObject("dataAttributes"); JSONObject dataAttributes = o.getJSONObject("dataAttributes");
JSONArray attributesJsonArray = dataAttributes.getJSONArray("attributesJsonArray"); JSONArray attributesJsonArray = dataAttributes.getJSONArray("attributesJsonArray");
for (int i = 0; i < attributesJsonArray.size(); i++) { for (int i = 0; i < attributesJsonArray.size(); i++) {
JSONObject attr = attributesJsonArray.getJSONObject(i); JSONObject attr = attributesJsonArray.getJSONObject(i);
String attrId = attr.getString("id"); String attrId = attr.getString("id");
String value = attr.getString("value"); String value = attr.getString("value");
if (!methodAttributeModelMap.containsKey(shapeName + "-" + attrId)) { if (!methodAttributeModelMap.containsKey(shapeName + "-" + attrId)) {
List<PALMethodAttributeModel> methodAttributeModels = CoeDesignerShapeAPIManager.getInstance().getValidAndUseAttributeModels(model.getWsId(), shapeCategory.replace("_", "."), shapeName, model.getMethodId()); List<PALMethodAttributeModel> methodAttributeModels = CoeDesignerShapeAPIManager.getInstance().getValidAndUseAttributeModels(model.getWsId(), shapeCategory.replace("_", "."), shapeName, model.getMethodId());
for (PALMethodAttributeModel attributeModel : methodAttributeModels) { for (PALMethodAttributeModel attributeModel : methodAttributeModels) {
@ -9068,26 +9075,38 @@ public class CoeProcessLevelWeb extends ActionWeb {
} }
PALMethodAttributeModel attrModel = methodAttributeModelMap.get(shapeName + "-" + attrId); PALMethodAttributeModel attrModel = methodAttributeModelMap.get(shapeName + "-" + attrId);
if (attrModel.getIsRequired()) {// 筛选必填 if (attrModel.getIsRequired()) {// 筛选必填
sb2=new StringBuffer();
String attrType = attrModel.getType(); String attrType = attrModel.getType();
if ("relation".equals(attrType) || "awsorg".equals(attrType)) { if ("relation".equals(attrType) || "awsorg".equals(attrType)) {
List<DesignerShapeRelationModel> list = DesignerShapeRelationCache.getListByAttrId(model.getId(), shapeId, attrId); List<DesignerShapeRelationModel> list = DesignerShapeRelationCache.getListByAttrId(model.getId(), shapeId, attrId);
if (list == null || list.isEmpty()) { if (list == null || list.isEmpty()) {
flag2 = false; flag2 = false;
} }
} /*else { } else {
flag2 = UtilString.isNotEmpty(value); flag2 = UtilString.isNotEmpty(value);
}*/ }
if (!flag2) { if (!flag2) {
JSONObject tmp = new JSONObject();
sb2.append("【"+o.get("text")+"】"+"''"+attrModel.getNewTitle()+"''").append(","); tmp.put("shapeId", shapeId);
tmp.put("shapeName", text);
tmp.put("attrName", attrModel.getNewTitle());
tmp.put("attrId", attrId);
resultList.add(tmp);
sb2.append("''"+attrModel.getNewTitle()+"''").append(",");
} }
} }
} }
if (!flag2) {
sb4.append("<span>节点名称:<span>"+"【"+text+"】").append(sb2).append("</br>");
}
} }
System.out.println(resultList);
ro.setData(resultList);
if( flag2==false){ if( flag2==false){
sb.append(sb2.substring(0, sb2.length()-1));
sb.append(sb4.substring(0, sb4.length()-1));
sb.append("未填写，请检查！"); sb.append("未填写，请检查！");
} }
@ -9162,23 +9181,30 @@ public class CoeProcessLevelWeb extends ActionWeb {
} }
/**
* 添加评论内容
* @param me
* @param ruuid
* @param replyContent
* @return
*/
public String createReply(UserContext me,String ruuid,String replyContent){ public String createReply(UserContext me,String ruuid,String replyContent){
ResponseObject result = ResponseObject.newOkResponse(); ResponseObject result = ResponseObject.newOkResponse();
AppAPI appApi = SDK.getAppAPI(); AppAPI appApi = SDK.getAppAPI();
Date now = new Date(); Date now = new Date();
Timestamp replyTime = new Timestamp(now.getTime()); Timestamp replyTime = new Timestamp(now.getTime());
SimpleDateFormat sdf=new SimpleDateFormat("yyyy-mm-dd HH:mm:ss");
try { try {
Map<String, Object> paramsMap = new HashMap<>(); Map<String, Object> paramsMap = new HashMap<>();
paramsMap.put("ID", UUIDGener.getUUID()); paramsMap.put("ID", UUIDGener.getUUID());
paramsMap.put("DATAID", ruuid); paramsMap.put("DATAID", ruuid);
paramsMap.put("REPLYER", me.getUID()); paramsMap.put("REPLYER", me.getUID());
paramsMap.put("REPLYTIME", replyTime); paramsMap.put("REPLYTIME", sdf.format(replyTime));
paramsMap.put("REPLYCONTENT", replyContent); paramsMap.put("REPLYCONTENT", replyContent);
paramsMap.put("REPLYERIP", me.getClientIP()); paramsMap.put("REPLYERIP", me.getClientIP());
paramsMap.put("ORGID", me.getDepartmentModel().getCompanyId()); paramsMap.put("ORGID", me.getDepartmentModel().getCompanyId());
int createresult = DBSql.update(DBSql.getInsertStatement("APP_ACT_PAL_DATA_REPLY", paramsMap), paramsMap); int createresult = DBSql.update(DBSql.getInsertStatement("APP_ACT_PAL_DATA_REPLY", paramsMap), paramsMap);
result.put("result","ok"); result.put("result","ok");
}catch (Exception e) { }catch (Exception e) {
e.printStackTrace(); e.printStackTrace();

6
com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/extend/js/designer.extend.link.view.portal.mobile.js
View File

@ -1652,7 +1652,7 @@ function ProcessManual(obj) {
t += '<td>'; t += '<td>';
t += '<div class="tablefileContent"><a href="javascript:void(0);" title="'+fileName+'" onclick="openOutputFile(\''+ taskId +'\')">'+ fileName +'</a>'; t += '<div class="tablefileContent"><a href="javascript:void(0);" title="'+fileName+'" onclick="openOutputFile(\''+ taskId +'\')">'+ fileName +'</a>';
t +='<button id="ProcessManual" type="button" class="awsui-btn awsui-btn-blue awsui-btn-sm">'; t +='<button id="ProcessManual" type="button" class="awsui-btn awsui-btn-blue awsui-btn-sm">';
t += '<i class="awsui-iconfont" title="手册下载" onclick="downloadProcessFile(\''+taskId+'\')">&#xe653;</i>'; /* t += '<i class="awsui-iconfont" title="手册下载" onclick="downloadProcessFile(\''+taskId+'\')">&#xe653;</i>';*/
t +='</button>'; t +='</button>';
t +='</div>'; t +='</div>';
@ -1688,7 +1688,7 @@ function openOutputFile(taskId) {
$.simpleAlert("close"); $.simpleAlert("close");
if (msg['data']) { if (msg['data']) {
var url = msg['data']['url']; var url = msg['data']['url'];
window.open(url); window.location.href = url;
} }
} else { } else {
$.simpleAlert("close"); $.simpleAlert("close");
@ -1828,7 +1828,7 @@ function initUpfileData(obj) {
var str=''; var str='';
splitId=splitId.substring(0,splitId.length-1); splitId=splitId.substring(0,splitId.length-1);
str +='<button id="ProcessManual" type="button" class="awsui-btn awsui-btn-blue awsui-btn-sm">'; str +='<button id="ProcessManual" type="button" class="awsui-btn awsui-btn-blue awsui-btn-sm">';
str += '<i class="awsui-iconfont" onclick="downloadZipFile(\''+splitId+'\',\''+toolbarname+'\',\''+taskId+'\')" title="打包下载">&#xe653;</i>'; /* str += '<i class="awsui-iconfont" onclick="downloadZipFile(\''+splitId+'\',\''+toolbarname+'\',\''+taskId+'\')" title="打包下载">&#xe653;</i>';*/
str +='</button>'; str +='</button>';
$('#dabao').html(str); $('#dabao').html(str);
} }