11

src/com/customization/csxg/GetShiftManagementBaseFormCmdIntercept.java

@@ -15,9 +15,6 @@ import java.util.Map;
 
 import static com.api.browser.util.ConditionType.CHECKBOX;
 
-/**
- * 打开班次基本信息页面时增加一个是否24小时制check按钮
- */
 @CommandDynamicProxy(target = GetShiftManagementBaseFormCmd.class )
 public class GetShiftManagementBaseFormCmdIntercept extends AbstractCommandProxy<Map<String,Object>> {
 
@@ -63,7 +60,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 ");
@@ -74,7 +71,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 = ?";

src/com/customization/csxg/SaveShiftManagementBaseFormCmdIntercept.java

@@ -18,9 +18,6 @@ import java.util.Map;
 
 import static com.api.browser.util.ConditionType.CHECKBOX;
 
-/**
- * 保存班次基本信息时处理一下是否24小时制字段的值
- */
 @CommandDynamicProxy(target = SaveShiftManagementBaseFormCmd.class )
 public class SaveShiftManagementBaseFormCmdIntercept extends AbstractCommandProxy<Map<String,Object>> {
 
@@ -29,6 +26,8 @@ public class SaveShiftManagementBaseFormCmdIntercept extends AbstractCommandProx
     @Override
     public Map<String, Object> execute(Command<Map<String, Object>> command) {
 
+
+
         basebean.writeLog("-----SaveShiftManagementBaseFormCmdIntercept Start-----");
 
         RecordSet rs = new RecordSet();
@@ -45,7 +44,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,15 +58,13 @@ public class SaveShiftManagementBaseFormCmdIntercept extends AbstractCommandProx
             Integer is24HourView = Util.getIntValue(Util.null2String(jsonObj.get("is24HourView")));
             basebean.writeLog("is24HourView: " + is24HourView);
 
-
+            String syncIs24Sql = "update kq_ShiftManagement set is24HourView = ? where id = ? ";//同步是否24小时制字段值
             if ( is24HourView ==-1 || is24HourView ==0) {//否
                 basebean.writeLog("is24HourView do 0 ");
-                String syncIs24NoSql = "update kq_ShiftManagement set is24HourView = ? where id = ? ";//同步是否24小时制字段值
-                rs.executeUpdate(syncIs24NoSql,0,shifMaId);
+                rs.executeUpdate(syncIs24Sql,0,shifMaId);
             } else {
                 basebean.writeLog("is24HourView do 1 ");
-                String syncIs24Sql = "update kq_ShiftManagement set is24HourView = ?,worktime = ? where id = ? ";//同步是否24小时制与worktime字段值
-                rs.executeUpdate(syncIs24Sql,1,"1440",shifMaId);
+                rs.executeUpdate(syncIs24Sql,1,shifMaId);
             }
 
         }