更新提报套打模板

GDYSL/js/deploy/easweb.ear/shr_web.war/addon/customer/web/js/compensation/batchSubmitShemeBillListEx.js

@@ -65,10 +65,11 @@ shr.defineClass("shr.compensation.BatchSubmitShemeBillListEx", shr.compensation.
 				hideAfter: 5
 			});
 			return;
+		} else {
+			//设置过滤条件
+			$("#submitShemeTemplate").shrPromptBox("setFilter", "calSubmitScheme.id = '" + submitSchemeId + "' and state = '1'");
+			//打开选择框
+			$("#submitShemeTemplate").shrPromptBox("open");
 		}
-		//设置过滤条件
-		$("#submitShemeTemplate").shrPromptBox("setFilter", "calSubmitScheme.id = '" + submitSchemeId + "' and state = '1'");
-		//打开选择框
-		$("#submitShemeTemplate").shrPromptBox("open");
 	},
 });

GDYSL/js/deploy/easweb.ear/shr_web.war/addon/customer/web/js/compensation/submitShemeTemplateEditBack.js

@@ -0,0 +1,147 @@
+/**
+ * 提报套打模板Edit.js
+ */
+var fields;
+shr.defineClass("shr.custom.SubmitShemeTemplateEditBack", shr.framework.Edit, {
+    initalizeDOM: function () {
+        shr.custom.SubmitShemeTemplateEditBack.superClass.initalizeDOM.call(this);
+        var _self = this;
+        $("#addRow_entry").hide();
+        $("#deleteRow_entry").hide();
+        if ($("#state").val() == "1") {
+            //启用状态的模板数据,不允许编辑
+            $("#edit").hide();
+            $("#enable").hide();
+        } else if ($("#state").val() == "0") {
+            //未启用状态的模板数据
+            $("#disable").hide();
+        } else if ($("#state").val() == "2") {
+            //禁用状态的模板数据
+            $("#disable").hide();
+        }
+        if (this.getOperateState() != "VIEW") {
+            $('[id^="attachment_"][id$="_null0"]').shrAttachment("option", {
+                //删除成功回调
+                deleteSuccessCallback: function (value) {
+                    console.log(value);
+                    //清空分录数据
+                    //_self.deleteEntry();
+                },
+                //上传成功回调
+                uploadSuccessCallback: function (value) {
+                    //获取上传文件的id
+                    //_self.deleteEntry();
+                    //_self.updateEntry();
+                }
+            });
+            //提报方案
+            $("#calSubmitScheme").shrPromptBox("option", {
+                //值改变
+                onchange: function (e, value) {
+                    if (!value.current) {
+                        _self.deleteEntry();
+                        return;
+                    }
+                    var id = value.current.id;
+                    if (!value.previous) {
+                        _self.deleteEntry();
+                        _self.updateEntry(id);
+                        return;
+                    }
+                    var oldId = value.previous.id;
+                    //附件id
+                    var attachmentId = _self.getAttachmentId();
+                    if (attachmentId && id) {
+                        //更新分录
+                        if (id != oldId) {
+                            _self.deleteEntry();
+                            _self.updateEntry(id);
+                        }
+                    } else {
+                        _self.deleteEntry();
+                    }
+                }
+            });
+            if (this.getOperateState() == "EDIT") {
+                //更新分录表格字段属性
+                _self.setEditGridOptions(this.initData.submitSchemeFields)
+            }
+        }
+    },
+    /**
+     * 
+     * @param {*} submitSchemeFields 设置编辑表格列属性
+     */
+    setEditGridOptions: function (submitSchemeFields) {
+        $entry = $("#entry");
+        $entry.jqGrid("getGridParam", "colModel").forEach(function (col) {
+            //设置列属性
+            if (col.name == "column" && col.editable && !col.hidden) {
+                // col.formatter = "shrselect";
+                // col.edittype = "shrselect";
+                // col.sorttype = "enum";
+                // col.required = true;
+                col.editoptions = {
+                    enumSource: {
+                        data: submitSchemeFields
+                    }
+                }
+                col.formatoptions = {
+                    enumSource: {
+                        data: submitSchemeFields
+                    }
+                }
+            };
+        });
+    },
+    /**
+     * 
+     * @returns {String} attachmentId 上传文件的id
+     */
+    getAttachmentId: function () {
+        //附件只能上传一个文件
+        var attachmentId = $('[id^="attachment_"][id$="_null0_uploadFileGrid"]').find('tr').eq(1).attr("id");
+        return attachmentId;
+    },
+    /**
+     * 更新分录
+     */
+    updateEntry: function (submitSchemeId) {
+        var _self = this;
+        //获取上传文件的id
+        var attachmentId = _self.getAttachmentId();
+        //提报方案id
+        if (!submitSchemeId) {
+            submitSchemeId = $("#calSubmitScheme").shrPromptBox("getValue").id
+        }
+        var hrOrgUnit = $('#hrOrgUnit').shrPromptBox('getValue');
+        var hrOrgUnitId = hrOrgUnit ? hrOrgUnit.id : "";
+        if (attachmentId && submitSchemeId) {
+            console.log(attachmentId);
+            //获取模板字段
+            var entryData = _self.remoteCall({
+                method: 'addEntryData',
+                param: {
+                    attachmentId: attachmentId,
+                    submitSchemeId: submitSchemeId,
+                    datasource: "2",
+                    costTypeId: "",
+                    hrOrgUnitId: hrOrgUnitId
+                },
+                isTransformParam: true,
+                async: false
+            });
+            //更新分录表格字段属性
+            _self.setEditGridOptions(entryData.submitSchemeFields)
+            //新增分录
+            $("#entry").jqGrid("addLocalRowData", entryData.entryInfos);
+        }
+    },
+
+    /**
+     * 删除分录
+     */
+    deleteEntry: function () {
+        $("#entry").jqGrid('clearGridData');
+    },
+});

GDYSL/js/deploy/easweb.ear/shr_web.war/addon/customer/web/js/compensation/submitShemeTemplateList.js

@@ -5,4 +5,27 @@ shr.defineClass("shr.custom.submitShemeTemplateList", shr.framework.List, {
     initalizeDOM: function () {
         shr.custom.submitShemeTemplateList.superClass.initalizeDOM.call(this);
     },
+    /**
+     *更新模板（不更新模板变量）
+     */
+    updateTemplateAction: function () {
+        var idArray = this.getSelectedFields("id");
+        if (idArray.length == 0) {
+            shr.showError({
+                message: "请选择需要维护的套打模板！</br> You must select at least one record!",
+            });
+            return;
+        } else if (idArray.length > 1) {
+            shr.showError({
+                message: "只能选择一条记录进行维护！</br> You can only select one record to maintain!",
+            });
+            return;
+        }
+        this.reloadPage({
+            uipk: "com.kingdee.eas.custom.compensation.app.SubmitShemeTemplate2.form",
+            method: "edit",
+            billId: idArray[0],
+        });
+    },
+
 });

GDYSL/src/com/kingdee/eas/custom/facade/houtsrepot/WorkhoursFacadeControllerBean.java

@@ -25,123 +25,126 @@ import com.kingdee.jdbc.rowset.IRowSet;
 
 /**
  * 个人兼职提报提醒
- * 
+ *
  * @author ISSUSER
  *
  */
 public class WorkhoursFacadeControllerBean extends AbstractWorkhoursFacadeControllerBean {
-	private static Logger logger = Logger
-			.getLogger("com.kingdee.eas.custom.facade.houtsrepot.WorkhoursFacadeControllerBean");
+    private static Logger logger = Logger
+            .getLogger("com.kingdee.eas.custom.facade.houtsrepot.WorkhoursFacadeControllerBean");
 
-	@Override
-	public void __workHour(Context ctx) {
+    @Override
+    public void __workHour(Context ctx) {
 
-		try {
-			// 获取链接
-			IParamControl ipc = ParamControlFactory.getLocalInstance(ctx);
-			String shrEnvironmentIP = ipc.getParamValue(null, "shrEnvironmentIP");
-			String website = shrEnvironmentIP + "/home.do";
-			IRowSet rowSet = getRowset(ctx);
-			Set<String> personSet = new HashSet();
-			// 获取日期名称
-			String fname = getFname(ctx);
-			LocalDate currentDate = LocalDate.now();
-			// 格式化为英文月份
-			DateTimeFormatter formatter = DateTimeFormatter.ofPattern("MMMM", Locale.ENGLISH);
-			//获取这个月的英文月份
-			String thisMonthName = currentDate.format(formatter);
-			//获取上个月的英文月份
-			LocalDate previousMonthDate = currentDate.minusMonths(1);
-			String LastMonthName = previousMonthDate.format(formatter);
-			int count =0;
-			while (rowSet.next()) {
+        try {
+            // 获取链接
+            IParamControl ipc = ParamControlFactory.getLocalInstance(ctx);
+            String shrEnvironmentIP = ipc.getParamValue(null, "shrEnvironmentIP");
+            String website = shrEnvironmentIP + "/home.do";
+            IRowSet rowSet = getRowset(ctx);
+            Set<String> personSet = new HashSet();
+            // 获取日期名称
+            String fname = getFname(ctx);
+            LocalDate currentDate = LocalDate.now();
+            // 格式化为英文月份
+            DateTimeFormatter formatter = DateTimeFormatter.ofPattern("MMMM", Locale.ENGLISH);
+            //获取这个月的英文月份
+            String thisMonthName = currentDate.format(formatter);
+            //获取上个月的英文月份
+            LocalDate previousMonthDate = currentDate.minusMonths(1);
+            String LastMonthName = previousMonthDate.format(formatter);
+            int count =0;
+            while (rowSet.next()) {
 
-				if (!personSet.contains(rowSet.getString("fid"))) {
+                if (!personSet.contains(rowSet.getString("fid"))) {
                     count++;
-					String title = "Working hours collection";// 标题
-					StringBuilder content = new StringBuilder("<html><head></head><body>");
-					content.append("<span>Dear " + rowSet.getString("perosnnaem") + ":" + "</span><br>");
-					content.append("<span></span><br>");
-					content.append(
-							"<span>This is a kind reminder to submit your working hours in "+LastMonthName+" <strong><u> by "+thisMonthName+" "+fname+".</u></strong> Please login to the system by below link and submit your working hours on time.</span><br>");
-					content.append("<span></span><br>");
-					// content.append("<span><a
-					// href=\"https://gtiit.kdeascloud.com/shr\">https://gtiit.kdeascloud.com/shr</a></span><br>");
-					content.append("<span><a href=\""+website+"\">"+website+"</a></span><br>");
-					content.append("<span></span><br>");
-					content.append(
-							"<span>Please remind that the working hours collection is once a month. Late submission will not be accepted.</span><br>");
-					content.append("<span></span><br>");
-					content.append(
-							"<span>Those who have no hours to submit please disregard this reminder. Please feel free to contact us if you have any problems.Thanks.</span><br>");
-					content.append("<span></span><br>");
-					content.append("<span>Best regards,</span><br>");
-					content.append("<span>Human Resources Department</span><br>");
-					content.append("</body></html>");
-					SendUtils.msgSend(ctx, title, PriorityEnum.HIGHT_VALUE, false, content.toString(),
-							rowSet.getString("fid"), BOSMsgTypeEnum.V_TYPE_EMAIL, null, null, MimeTypeEnum.HTML);
-					personSet.add(rowSet.getString("fid"));
-					logger.error("我的邮件收件人的fid是"+rowSet.getString("fid")+"...."+Integer.toString(count));
-				}
-			}
+                    String title = "Working hours collection";// 标题
+                    StringBuilder content = new StringBuilder("<html><head></head><body>");
+                    content.append("<span>Dear " + rowSet.getString("perosnnaem") + ":" + "</span><br>");
+                    content.append("<span></span><br>");
+                    content.append(
+                            "<span>This is a kind reminder to submit your working hours in "+LastMonthName+" <strong><u> by "+thisMonthName+" "+fname+".</u></strong> Please login to the system by below link and submit your working hours on time.</span><br>");
+                    content.append("<span></span><br>");
+                    // content.append("<span><a
+                    // href=\"https://gtiit.kdeascloud.com/shr\">https://gtiit.kdeascloud.com/shr</a></span><br>");
+                    content.append("<span><a href=\""+website+"\">"+website+"</a></span><br>");
+                    content.append("<span></span><br>");
+                    content.append(
+                            "<span>Please remind that the working hours collection is once a month. Late submission will not be accepted.</span><br>");
+                    content.append("<span></span><br>");
+                    content.append(
+                            "<span>Those who have no hours to submit please disregard this reminder. Please feel free to contact us if you have any problems.Thanks.</span><br>");
+                    content.append("<span></span><br>");
+                    content.append("<span>Best regards,</span><br>");
+                    content.append("<span>Human Resources Department</span><br>");
+                    content.append("</body></html>");
+                    SendUtils.msgSend(ctx, title, PriorityEnum.HIGHT_VALUE, false, content.toString(),
+                            rowSet.getString("fid"), BOSMsgTypeEnum.V_TYPE_EMAIL, null, null, MimeTypeEnum.HTML);
+                    personSet.add(rowSet.getString("fid"));
+                    logger.error("我的邮件收件人的fid是"+rowSet.getString("fid")+"...."+Integer.toString(count));
+                }
+            }
 
-		} catch (EASBizException e) {
+        } catch (EASBizException e) {
 
-			e.printStackTrace();
-		} catch (SQLException e) {
+            e.printStackTrace();
+        } catch (SQLException e) {
 
-			e.printStackTrace();
-		} catch (BOSException e) {
-			logger.error("个人提报兼职工时申请提醒通知失败：" + e.getMessage());
-			e.printStackTrace();
-		}catch(Exception e) {
-			logger.info("个人提报兼职工时申请提醒通知失败： ",e);
-		}
+            e.printStackTrace();
+        } catch (BOSException e) {
+            logger.error("个人提报兼职工时申请提醒通知失败：" + e.getMessage());
+            e.printStackTrace();
+        }catch(Exception e) {
+            logger.info("个人提报兼职工时申请提醒通知失败： ",e);
+        }
 
-	}
+    }
 
-	// 查询任职类型是兼职 当天时期在失效和开始日期之间 时薪大于0
-	public IRowSet getRowset(Context ctx) {
-		// 获取当前日期
-		Date nowdate = new Date();
-		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-		String stringDate = sdf.format(nowdate);
-		String sql = "select a.FName_L1 as perosnnaem,e.FName_L1 as postonName,a.fid from T_BD_Person a  left \r\n"
-				+ "join T_HR_EMPORGRELATION c  on  a.fid=c.FPERSONID   left join T_ORG_Position e on e.fid=c.fpositionid\r\n"
-				+ "where  c.CFHourlywage>'0' and c.feffdt<=" + "'" + stringDate + "'" + " and c.fleffdt>=" + "'"
-				+ stringDate + "'";
-		IRowSet rowSet = null;
-		try {
-			rowSet = DbUtil.executeQuery(ctx, sql);
-		} catch (BOSException e) {
-			// TODO 自动生成的 catch 块
-			e.printStackTrace();
-		}
-		return rowSet;
+    // 查询任职类型是兼职 当天时期在失效和开始日期之间 时薪大于0
+    public IRowSet getRowset(Context ctx) {
+        // 获取当前日期
+        Date nowdate = new Date();
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        String stringDate = sdf.format(nowdate);
+        String sql = "select a.FName_L1 as perosnnaem,e.FName_L1 as postonName,a.fid from T_BD_Person a  left \r\n"
+                + "join T_HR_EMPORGRELATION c on a.fid=c.FPERSONID\r\n"
+                + "left join T_ORG_Position e on e.fid=c.fpositionid\r\n"
+                //新增用工关系判断,不占人头的员工不发送邮件
+                + "left join T_HR_EMPLABORRELATIONHIS ehis on ehis.fpersonid=a.fid and ehis.feffdt<='" + stringDate + "' and ehis.fleffdt >='" + stringDate + "'\r\n"
+                + "left join T_HR_BDEmployeeType type on ehis.flaborrelationstateid = type.fid\r\n"
+                + "where  c.CFHourlywage>'0' and c.feffdt<='" + stringDate + "' and c.fleffdt>='" + stringDate + "' and type.FISINCOUNT =1 ";
+        IRowSet rowSet = null;
+        try {
+            rowSet = DbUtil.executeQuery(ctx, sql);
+        } catch (BOSException e) {
+            // TODO 自动生成的 catch 块
+            e.printStackTrace();
+        }
+        return rowSet;
 
-	}
+    }
 
-	/**
-	 * 薪酬预留基础数据的名称
-	 * 
-	 * @return
-	 */
-	public String getFname(Context ctx) {
-		String sql = "SELECT FName_l1 as fname FROM T_HR_SHRRsvItem0 where FNumber='1004'";
-		String fname = null;
-		try {
-			IRowSet rs = DbUtil.executeQuery(ctx, sql);
-			while (rs.next()) {
-				fname = rs.getString("fname");
-			}
-		} catch (BOSException e) {
-			// TODO 自动生成的 catch 块
-			e.printStackTrace();
-		} catch (SQLException e) {
-			// TODO 自动生成的 catch 块
-			e.printStackTrace();
-		}
-		return fname;
-	}
+    /**
+     * 薪酬预留基础数据的名称
+     *
+     * @return
+     */
+    public String getFname(Context ctx) {
+        String sql = "SELECT FName_l1 as fname FROM T_HR_SHRRsvItem0 where FNumber='1004'";
+        String fname = null;
+        try {
+            IRowSet rs = DbUtil.executeQuery(ctx, sql);
+            while (rs.next()) {
+                fname = rs.getString("fname");
+            }
+        } catch (BOSException e) {
+            // TODO 自动生成的 catch 块
+            e.printStackTrace();
+        } catch (SQLException e) {
+            // TODO 自动生成的 catch 块
+            e.printStackTrace();
+        }
+        return fname;
+    }
 
 }

patch/20251013（未部署）/eas/server/deploy/easweb.ear/shr_web.war/addon/customer/web/js/compensation/batchSubmitShemeBillListEx.js

@@ -65,10 +65,11 @@ shr.defineClass("shr.compensation.BatchSubmitShemeBillListEx", shr.compensation.
 				hideAfter: 5
 			});
 			return;
+		} else {
+			//设置过滤条件
+			$("#submitShemeTemplate").shrPromptBox("setFilter", "calSubmitScheme.id = '" + submitSchemeId + "' and state = '1'");
+			//打开选择框
+			$("#submitShemeTemplate").shrPromptBox("open");
 		}
-		//设置过滤条件
-		$("#submitShemeTemplate").shrPromptBox("setFilter", "calSubmitScheme.id = '" + submitSchemeId + "' and state = '1'");
-		//打开选择框
-		$("#submitShemeTemplate").shrPromptBox("open");
 	},
 });

patch/20251013（未部署）/eas/server/deploy/easweb.ear/shr_web.war/addon/customer/web/js/compensation/submitShemeTemplateEditBack.js

@@ -0,0 +1,147 @@
+/**
+ * 提报套打模板Edit.js
+ */
+var fields;
+shr.defineClass("shr.custom.SubmitShemeTemplateEditBack", shr.framework.Edit, {
+    initalizeDOM: function () {
+        shr.custom.SubmitShemeTemplateEditBack.superClass.initalizeDOM.call(this);
+        var _self = this;
+        $("#addRow_entry").hide();
+        $("#deleteRow_entry").hide();
+        if ($("#state").val() == "1") {
+            //启用状态的模板数据,不允许编辑
+            $("#edit").hide();
+            $("#enable").hide();
+        } else if ($("#state").val() == "0") {
+            //未启用状态的模板数据
+            $("#disable").hide();
+        } else if ($("#state").val() == "2") {
+            //禁用状态的模板数据
+            $("#disable").hide();
+        }
+        if (this.getOperateState() != "VIEW") {
+            $('[id^="attachment_"][id$="_null0"]').shrAttachment("option", {
+                //删除成功回调
+                deleteSuccessCallback: function (value) {
+                    console.log(value);
+                    //清空分录数据
+                    //_self.deleteEntry();
+                },
+                //上传成功回调
+                uploadSuccessCallback: function (value) {
+                    //获取上传文件的id
+                    //_self.deleteEntry();
+                    //_self.updateEntry();
+                }
+            });
+            //提报方案
+            $("#calSubmitScheme").shrPromptBox("option", {
+                //值改变
+                onchange: function (e, value) {
+                    if (!value.current) {
+                        _self.deleteEntry();
+                        return;
+                    }
+                    var id = value.current.id;
+                    if (!value.previous) {
+                        _self.deleteEntry();
+                        _self.updateEntry(id);
+                        return;
+                    }
+                    var oldId = value.previous.id;
+                    //附件id
+                    var attachmentId = _self.getAttachmentId();
+                    if (attachmentId && id) {
+                        //更新分录
+                        if (id != oldId) {
+                            _self.deleteEntry();
+                            _self.updateEntry(id);
+                        }
+                    } else {
+                        _self.deleteEntry();
+                    }
+                }
+            });
+            if (this.getOperateState() == "EDIT") {
+                //更新分录表格字段属性
+                _self.setEditGridOptions(this.initData.submitSchemeFields)
+            }
+        }
+    },
+    /**
+     * 
+     * @param {*} submitSchemeFields 设置编辑表格列属性
+     */
+    setEditGridOptions: function (submitSchemeFields) {
+        $entry = $("#entry");
+        $entry.jqGrid("getGridParam", "colModel").forEach(function (col) {
+            //设置列属性
+            if (col.name == "column" && col.editable && !col.hidden) {
+                // col.formatter = "shrselect";
+                // col.edittype = "shrselect";
+                // col.sorttype = "enum";
+                // col.required = true;
+                col.editoptions = {
+                    enumSource: {
+                        data: submitSchemeFields
+                    }
+                }
+                col.formatoptions = {
+                    enumSource: {
+                        data: submitSchemeFields
+                    }
+                }
+            };
+        });
+    },
+    /**
+     * 
+     * @returns {String} attachmentId 上传文件的id
+     */
+    getAttachmentId: function () {
+        //附件只能上传一个文件
+        var attachmentId = $('[id^="attachment_"][id$="_null0_uploadFileGrid"]').find('tr').eq(1).attr("id");
+        return attachmentId;
+    },
+    /**
+     * 更新分录
+     */
+    updateEntry: function (submitSchemeId) {
+        var _self = this;
+        //获取上传文件的id
+        var attachmentId = _self.getAttachmentId();
+        //提报方案id
+        if (!submitSchemeId) {
+            submitSchemeId = $("#calSubmitScheme").shrPromptBox("getValue").id
+        }
+        var hrOrgUnit = $('#hrOrgUnit').shrPromptBox('getValue');
+        var hrOrgUnitId = hrOrgUnit ? hrOrgUnit.id : "";
+        if (attachmentId && submitSchemeId) {
+            console.log(attachmentId);
+            //获取模板字段
+            var entryData = _self.remoteCall({
+                method: 'addEntryData',
+                param: {
+                    attachmentId: attachmentId,
+                    submitSchemeId: submitSchemeId,
+                    datasource: "2",
+                    costTypeId: "",
+                    hrOrgUnitId: hrOrgUnitId
+                },
+                isTransformParam: true,
+                async: false
+            });
+            //更新分录表格字段属性
+            _self.setEditGridOptions(entryData.submitSchemeFields)
+            //新增分录
+            $("#entry").jqGrid("addLocalRowData", entryData.entryInfos);
+        }
+    },
+
+    /**
+     * 删除分录
+     */
+    deleteEntry: function () {
+        $("#entry").jqGrid('clearGridData');
+    },
+});

patch/20251013（未部署）/eas/server/deploy/easweb.ear/shr_web.war/addon/customer/web/js/compensation/submitShemeTemplateList.js

@@ -5,4 +5,27 @@ shr.defineClass("shr.custom.submitShemeTemplateList", shr.framework.List, {
     initalizeDOM: function () {
         shr.custom.submitShemeTemplateList.superClass.initalizeDOM.call(this);
     },
+    /**
+     *更新模板（不更新模板变量）
+     */
+    updateTemplateAction: function () {
+        var idArray = this.getSelectedFields("id");
+        if (idArray.length == 0) {
+            shr.showError({
+                message: "请选择需要维护的套打模板！</br> You must select at least one record!",
+            });
+            return;
+        } else if (idArray.length > 1) {
+            shr.showError({
+                message: "只能选择一条记录进行维护！</br> You can only select one record to maintain!",
+            });
+            return;
+        }
+        this.reloadPage({
+            uipk: "com.kingdee.eas.custom.compensation.app.SubmitShemeTemplate2.form",
+            method: "edit",
+            billId: idArray[0],
+        });
+    },
+
 });