diff --git a/src/com/customization/csxg/GetShiftManagementBaseFormCmdIntercept.java b/src/com/customization/csxg/GetShiftManagementBaseFormCmdIntercept.java index 2ec14c3..c9928d1 100644 --- a/src/com/customization/csxg/GetShiftManagementBaseFormCmdIntercept.java +++ b/src/com/customization/csxg/GetShiftManagementBaseFormCmdIntercept.java @@ -15,6 +15,9 @@ import java.util.Map; import static com.api.browser.util.ConditionType.CHECKBOX; +/** + * 打开班次基本信息页面时增加一个是否24小时制check按钮 + */ @CommandDynamicProxy(target = GetShiftManagementBaseFormCmd.class ) public class GetShiftManagementBaseFormCmdIntercept extends AbstractCommandProxy> { @@ -60,7 +63,7 @@ public class GetShiftManagementBaseFormCmdIntercept extends AbstractCommandProxy scConItem.setDomkey(domkeyArr); scConItem.setLabel("是否24小时制班次"); scConItem.setValue("0"); - scConItem.setHelpfulTip("勾选后,则该班次为24小时制,第一次打开时间到最后一次打卡时间之间的都算做工作时间"); + scConItem.setHelpfulTip("勾选后,则该班次为24小时制,第一次打卡时间到最后一次打卡时间之间的都算做工作时间"); items.add(scConItem); } else { basebean.writeLog("shiftMaId not is blank "); @@ -71,7 +74,7 @@ public class GetShiftManagementBaseFormCmdIntercept extends AbstractCommandProxy String[] domkeyArr = {"is24HourView"}; scConItem.setDomkey(domkeyArr); scConItem.setLabel("是否24小时制班次"); - scConItem.setHelpfulTip("勾选后,则该班次为24小时制,第一次打开时间到最后一次打卡时间之间的都算做工作时间"); + scConItem.setHelpfulTip("勾选后,则该班次为24小时制,第一次打卡时间到最后一次打卡时间之间的都算做工作时间"); //查询是与否 Integer is24HourView = -1; String acqSql = "select is24HourView from kq_ShiftManagement where id = ?"; diff --git a/src/com/customization/csxg/SaveShiftManagementBaseFormCmdIntercept.java b/src/com/customization/csxg/SaveShiftManagementBaseFormCmdIntercept.java index 6b38f5a..fd2c768 100644 --- a/src/com/customization/csxg/SaveShiftManagementBaseFormCmdIntercept.java +++ b/src/com/customization/csxg/SaveShiftManagementBaseFormCmdIntercept.java @@ -18,6 +18,9 @@ import java.util.Map; import static com.api.browser.util.ConditionType.CHECKBOX; +/** + * 保存班次基本信息时处理一下是否24小时制字段的值 + */ @CommandDynamicProxy(target = SaveShiftManagementBaseFormCmd.class ) public class SaveShiftManagementBaseFormCmdIntercept extends AbstractCommandProxy> { @@ -42,7 +45,7 @@ public class SaveShiftManagementBaseFormCmdIntercept extends AbstractCommandProx Integer status = Util.getIntValue(Util.null2String(result.get("status"))); basebean.writeLog("status: " + status); - if ( status != 1) { + if ( status == 1) { shifMaId = Util.getIntValue(Util.null2String(result.get("id"))); } basebean.writeLog("shifMaId: " + shifMaId); @@ -59,9 +62,11 @@ public class SaveShiftManagementBaseFormCmdIntercept extends AbstractCommandProx String syncIs24Sql = "update kq_ShiftManagement set is24HourView = ? where id = ? ";//同步是否24小时制字段值 if ( is24HourView ==-1 || is24HourView ==0) {//否 basebean.writeLog("is24HourView do 0 "); + rs.executeUpdate(syncIs24Sql,0,shifMaId); } else { basebean.writeLog("is24HourView do 1 "); + rs.executeUpdate(syncIs24Sql,1,shifMaId); }