diff --git a/javascript/common/dev.js b/javascript/common/dev.js
index 331fa30..67a3756 100644
--- a/javascript/common/dev.js
+++ b/javascript/common/dev.js
@@ -233,7 +233,28 @@ WfForm.showConfirm = function (content, okEvent, cancelEvent, otherInfo = {}) {
/* ******************* 建模表开发依赖 ******************* */
-const ModeList = {}
+const ModeList = {
+ /**
+ * getCheckedID: function()
+ *
+ * 描述: 选中的checkbox的值(主表数据ID)
+ * @returns {undefined}
+ */
+ getCheckedID() {
+ return undefined;
+ },
+ /**
+ * showLoading: function(show, size, msg)
+ *
+ * 描述: 控制全局loading的显示/隐藏
+ * @param show
+ * @param size
+ * @param msg
+ */
+ showLoading(show, size, msg) {
+
+ }
+}
ModeList.dataLoadAfter = function (data) {
// 描述:在列表数据加载完,对列表的数据进行二次加工,并渲染。 dataLoadAfter传入dataHandle方法,用来接收并处理数据,dataHandle有两个参数。
// var dataHandle = function(datas,displayType){
diff --git a/javascript/youhong.ai/taibao/建模打包带数据到指定明细.js b/javascript/youhong.ai/taibao/建模打包带数据到指定明细.js
new file mode 100644
index 0000000..75e2a2c
--- /dev/null
+++ b/javascript/youhong.ai/taibao/建模打包带数据到指定明细.js
@@ -0,0 +1,109 @@
+/* ******************* youhong.ai 建模部分 start ******************* */
+$(() => {
+ let config = {
+ workflowUrl: '',
+ table: '',
+ detailTable: 'detail_1',
+ fieldMap: {
+ fkgs: 'fkgs',
+ zw: 'zw',
+ fj: 'fj'
+ }
+ }
+
+ function jumpToWorkflow() {
+ let ids = ModeList.getCheckedID();
+ let url = `${config.workflowUrl}&table=${config.table}&ids=${ids}&detail=${config.detailTable}&field_map=${JSON.stringify(config.fieldMap)}`
+ window.open(url, "_blank")
+ }
+
+ window.jumpToWorkflow = jumpToWorkflow
+})
+
+/* ******************* youhong.ai 建模部分 end ******************* */
+
+
+/* ******************* youhong.ai 流程部分 start ******************* */
+$(() => {
+
+ function getQueryString(name) {
+ let reg = new RegExp("(^|&|\/?)" + name + "=([^&]*)(&|$)", "i");
+ let searchStr = window.location.href
+ if (searchStr.startsWith('&')) {
+ searchStr = searchStr.substr(1)
+ }
+ let search = searchStr.match(reg)
+ if (search != null) {
+ return unescape(search[2]);
+ }
+ return null;
+ }
+
+ function getConfig() {
+ let tableName = getQueryString("table")
+ let ids = getQueryString("ids")
+ let mapping = getQueryString("field_map")
+ let detail = getQueryString("detail")
+ let fieldMap = JSON.parse(mapping)
+ return {
+ table: tableName,
+ ids,
+ fieldMap,
+ detailTable: detail
+ }
+ }
+
+ function runJs(config) {
+ console.log("config", config)
+ let {WeaLoadingGlobal} = ecCom
+ WeaLoadingGlobal.start();
+ $.ajax(`/aiyh/taibao/packing2model/packing?table=${config.table}&ids=${config.ids}`, {
+ success: (res) => {
+ WeaLoadingGlobal.destroy();
+ if (res && res.code === 200) {
+ console.log("获取到的数据", res.data)
+ let modelData = res.data
+ let fieldMap = config.fieldMap
+ let workflowDetailList = []
+ modelData.forEach(item => {
+ let obj = {}
+ Object.keys(fieldMap).forEach(key => {
+ obj[key] = item[fieldMap[key]]
+ })
+ workflowDetailList.push(obj)
+ })
+ console.log("收集整理的数据:", workflowDetailList)
+ addDetailValue(workflowDetailList, config.detailTable)
+ } else {
+ WfForm.showMessage("打包数据错误,无法带出数据!", 2, 5);
+ }
+ },
+ error: (err) => {
+ WeaLoadingGlobal.destroy();
+ WfForm.showMessage("网路异常,打包失败!", 2, 5);
+ console.log(err)
+ },
+ complete: () => {
+ WeaLoadingGlobal.destroy();
+ }
+ })
+ }
+
+ function addDetailValue(workflowDetailList, detail) {
+ workflowDetailList.forEach(item => {
+ let valueMap = {}
+ Object.keys(item).forEach(key => {
+ valueMap[WfForm.convertFieldNameToId(key, detail)] = {
+ value: item[key]
+ }
+ })
+ console.log("添加明细行数据", valueMap)
+ WfForm.addDetailRow(detail, valueMap);
+ })
+ }
+
+ runJs(getConfig())
+
+})
+
+/* ******************* youhong.ai 流程部分 end ******************* */
\ No newline at end of file
diff --git a/src/main/java/aiyh/utils/Util.java b/src/main/java/aiyh/utils/Util.java
index bb5deba..bec3d42 100644
--- a/src/main/java/aiyh/utils/Util.java
+++ b/src/main/java/aiyh/utils/Util.java
@@ -4053,6 +4053,14 @@ public class Util extends weaver.general.Util {
return filePath;
}
+ /**
+ *
创建临时文件
+ *
+ * @param inputStream 文件流
+ * @param imageFileName 文件名
+ * @param tempDir 临时文件夹
+ * @return 文件路径
+ */
public static String createTempFile(InputStream inputStream, String imageFileName, String tempDir) {
String filePath = getTempFilePath(tempDir, imageFileName);
try {
@@ -4063,6 +4071,13 @@ public class Util extends weaver.general.Util {
return filePath;
}
+ /**
+ * 写入文件数据
+ *
+ * @param inputStream 文件流
+ * @param filePath 文件路径
+ * @throws IOException io异常
+ */
public static void writeToFile(InputStream inputStream, String filePath) throws IOException {
Path path = Paths.get(filePath);
Path parentDir = path.getParent();
diff --git a/src/main/java/com/api/youhong/ai/ihgzhouji/taskele/contoller/TaskElementController.java b/src/main/java/com/api/youhong/ai/ihgzhouji/taskele/contoller/TaskElementController.java
index 7e5ea84..dfef1fc 100644
--- a/src/main/java/com/api/youhong/ai/ihgzhouji/taskele/contoller/TaskElementController.java
+++ b/src/main/java/com/api/youhong/ai/ihgzhouji/taskele/contoller/TaskElementController.java
@@ -32,10 +32,11 @@ public class TaskElementController {
@GET
@Produces(MediaType.APPLICATION_JSON)
@Consumes(MediaType.APPLICATION_JSON)
- public String getList(@Context HttpServletRequest request, @Context HttpServletResponse response) {
+ public String getList(@Context HttpServletRequest request, @Context HttpServletResponse response,
+ @QueryParam("itemGroup") String itemGroup) {
User user = HrmUserVarify.getUser(request, response);
try {
- return ApiResult.success(service.getList(user));
+ return ApiResult.success(service.getList(user,itemGroup));
} catch (Exception e) {
log.error("get task list error!\n" + Util.getErrString(e));
return ApiResult.error("system error!");
diff --git a/src/main/java/com/api/youhong/ai/ihgzhouji/taskele/mapper/TaskElementMapper.java b/src/main/java/com/api/youhong/ai/ihgzhouji/taskele/mapper/TaskElementMapper.java
index 164c565..194616b 100644
--- a/src/main/java/com/api/youhong/ai/ihgzhouji/taskele/mapper/TaskElementMapper.java
+++ b/src/main/java/com/api/youhong/ai/ihgzhouji/taskele/mapper/TaskElementMapper.java
@@ -44,6 +44,33 @@ public interface TaskElementMapper {
})
List selectConfig();
+ /**
+ * 查询配置信息
+ *
+ * @param itemGroup 分组
+ * @return 配置信息
+ */
+ @Select("select * from uf_ihg_el_config where enable_status = 1 and item_group = #{itemGroup}")
+ @Associations({
+ @Association(
+ property = "icon",
+ column = "icon",
+ id = @Id(methodId = 1, value = String.class)),
+ @Association(
+ property = "iconActive",
+ column = "icon_active",
+ id = @Id(methodId = 1, value = String.class)),
+ @Association(
+ property = "iconMobile",
+ column = "icon_mobile",
+ id = @Id(methodId = 1, value = String.class)),
+ @Association(
+ property = "iconMobileActive",
+ column = "icon_mobile_active",
+ id = @Id(methodId = 1, value = String.class))
+ })
+ List selectConfigByGroup(@ParamMapper("itemGroup") String itemGroup);
+
/**
* 查询配置信息
*
@@ -121,4 +148,6 @@ public interface TaskElementMapper {
*/
@Select(custom = true)
String selectConvert(@SqlString String sql, @ParamMapper("value") String o);
+
+
}
diff --git a/src/main/java/com/api/youhong/ai/ihgzhouji/taskele/service/TaskElementService.java b/src/main/java/com/api/youhong/ai/ihgzhouji/taskele/service/TaskElementService.java
index 5845bc2..86d3704 100644
--- a/src/main/java/com/api/youhong/ai/ihgzhouji/taskele/service/TaskElementService.java
+++ b/src/main/java/com/api/youhong/ai/ihgzhouji/taskele/service/TaskElementService.java
@@ -48,8 +48,13 @@ public class TaskElementService {
return config;
}
- public List getList(User user) {
- List ihgTaskElementConfItemList = mapper.selectConfig();
+ public List getList(User user,String itemGroup) {
+ List ihgTaskElementConfItemList = null;
+ if (StrUtil.isBlank(itemGroup)) {
+ ihgTaskElementConfItemList = mapper.selectConfig();
+ }else {
+ ihgTaskElementConfItemList = mapper.selectConfigByGroup(itemGroup);
+ }
if (CollectionUtil.isEmpty(ihgTaskElementConfItemList)) {
return Collections.emptyList();
}
diff --git a/src/main/java/com/api/youhong/ai/taibao/dabao/controller/PackingToWorkflowController.java b/src/main/java/com/api/youhong/ai/taibao/dabao/controller/PackingToWorkflowController.java
new file mode 100644
index 0000000..23f749f
--- /dev/null
+++ b/src/main/java/com/api/youhong/ai/taibao/dabao/controller/PackingToWorkflowController.java
@@ -0,0 +1,39 @@
+package com.api.youhong.ai.taibao.dabao.controller;
+
+import aiyh.utils.ApiResult;
+import aiyh.utils.Util;
+import com.api.youhong.ai.taibao.dabao.service.PackingToWorkflowService;
+import org.apache.log4j.Logger;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.QueryParam;
+import javax.ws.rs.core.MediaType;
+
+/**
+ * 打包到流程
+ *
+ * create: 2023/6/7 13:45
+ *
+ * @author youHong.ai
+ */
+@Path("/aiyh/taibao/packing2model")
+public class PackingToWorkflowController {
+ private final Logger log = Util.getLogger();
+
+ private final PackingToWorkflowService service = new PackingToWorkflowService();
+
+ @Path("/packing")
+ @GET
+ @Produces(MediaType.APPLICATION_JSON)
+ public String getPackingData(@QueryParam("table") String table, @QueryParam("ids") String ids) {
+ try {
+ return ApiResult.success(service.getPackingData(table, ids));
+ } catch (Exception e) {
+ log.error("打包数据查询异常:" + Util.getErrString(e));
+ return ApiResult.error("system error");
+ }
+ }
+
+}
diff --git a/src/main/java/com/api/youhong/ai/taibao/dabao/mapper/PackingToWorkflowMapper.java b/src/main/java/com/api/youhong/ai/taibao/dabao/mapper/PackingToWorkflowMapper.java
new file mode 100644
index 0000000..93c0f73
--- /dev/null
+++ b/src/main/java/com/api/youhong/ai/taibao/dabao/mapper/PackingToWorkflowMapper.java
@@ -0,0 +1,31 @@
+package com.api.youhong.ai.taibao.dabao.mapper;
+
+import aiyh.utils.annotation.recordset.ParamMapper;
+import aiyh.utils.annotation.recordset.Select;
+import aiyh.utils.annotation.recordset.SqlMapper;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ *
+ *
+ * create: 2023/6/7 13:54
+ *
+ * @author youHong.ai
+ */
+@SqlMapper
+public interface PackingToWorkflowMapper {
+
+ /**
+ * 查询建模表指定id数据
+ *
+ * @param tableName 建模表名
+ * @param ids 数据id
+ * @return 数据
+ */
+ @Select("select * from $t{tableName} where id in ($t{ids})")
+ List