chenwei
/
weaver-sskj
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
dev
chenwei 1 year ago
parent 8fb7e4bbec 6c374db8e4
commit 37e4d8592b
2 changed files with 11 additions and 19 deletions
Show Stats Download Patch File Download Diff File

18
src/weaver/interfaces/sskj/action/OverTimeAction.java
Unescape Escape View File

@ -108,6 +108,9 @@ public class OverTimeAction implements Action {
//判断当天加班是否需要转调休 //判断当天加班是否需要转调休
int paidLeaveEnable = overtimeRulesDetail.getPaidLeaveEnable(); int paidLeaveEnable = overtimeRulesDetail.getPaidLeaveEnable();
bb.writeLog("paidLeaveEnable:" + paidLeaveEnable); bb.writeLog("paidLeaveEnable:" + paidLeaveEnable);
String syncConOverTimeSql = "insert into uf_conOvertime (requestId,resourceId, fromDate, fromTime, toDate, toTime, formmodeid, modedatacreater, modedatacreatertype, modedatacreatedate, modedatacreatetime, MODEUUID)" +
" values (?,?,?,?,?,?,?,?,?,?,?,?)";
String conOvertimeModeId = bb.getPropValue("project_sskj", "conOvertimeModeId");
if (paidLeaveEnable == 0 ) {//不转调休 if (paidLeaveEnable == 0 ) {//不转调休
//直接生成加班数据 //直接生成加班数据
int computingMode = overtimeRulesDetail.getComputingMode(); int computingMode = overtimeRulesDetail.getComputingMode();
@ -122,19 +125,14 @@ public class OverTimeAction implements Action {
boolean b = genOvertimeData(requestId, Util.null2String(resourceId), fromDate, toDate, belongTo, fromTime, toTime, String.valueOf(durationOfOvertime), boolean b = genOvertimeData(requestId, Util.null2String(resourceId), fromDate, toDate, belongTo, fromTime, toTime, String.valueOf(durationOfOvertime),
String.valueOf(changeType), "1", String.valueOf(paidLeaveEnable), String.valueOf(computingMode), null); String.valueOf(changeType), "1", String.valueOf(paidLeaveEnable), String.valueOf(computingMode), null);
if (b) { if (b) {
//将加班数据记录到连班加班建模表中 //将加班数据记录到连班加班建模表中
String syncConOverTimeSql = "insert into uf_conOvertime (resourceId, fromDate, fromTime, toDate, toTime, formmodeid, modedatacreater, modedatacreatertype, modedatacreatedate, modedatacreatetime, MODEUUID)" +
" values (?,?,?,?,?,?,?,?,?,?,?)";
String conOvertimeModeId = bb.getPropValue("project_sskj", "conOvertimeModeId");
Integer modedatacreater = 1; Integer modedatacreater = 1;
Integer modedatacreatertype = 0; Integer modedatacreatertype = 0;
String modedatacreatedate = DateUtil.format(new Date(), "yyyy-MM-dd"); String modedatacreatedate = DateUtil.format(new Date(), "yyyy-MM-dd");
String modedatacreatetime = DateUtil.format(new Date(), "HH:mm:ss"); String modedatacreatetime = DateUtil.format(new Date(), "HH:mm:ss");
String uuid = UUID.randomUUID().toString(); String uuid = UUID.randomUUID().toString();
bb.writeLog("syncConOverTimeSql：" + syncConOverTimeSql); bb.writeLog("syncConOverTimeSql：" + syncConOverTimeSql);
boolean addFlag = rs.executeUpdate(syncConOverTimeSql, requestId,resourceId, fromDate, fromTime, toDate, toTime, conOvertimeModeId, modedatacreater, modedatacreatertype, modedatacreatedate,
boolean addFlag = rs.executeUpdate(syncConOverTimeSql, resourceId, fromDate, fromTime, toDate, toTime, conOvertimeModeId, modedatacreater, modedatacreatertype, modedatacreatedate,
modedatacreatetime, uuid); modedatacreatetime, uuid);
bb.writeLog("addFlag：" + addFlag); bb.writeLog("addFlag：" + addFlag);
if (addFlag) { if (addFlag) {
@ -185,17 +183,13 @@ public class OverTimeAction implements Action {
String.valueOf(changeType), "1", String.valueOf(paidLeaveEnable), String.valueOf(computingMode), tiaoxiuId); String.valueOf(changeType), "1", String.valueOf(paidLeaveEnable), String.valueOf(computingMode), tiaoxiuId);
if (b) { if (b) {
//将加班数据记录到连班加班建模表中 //将加班数据记录到连班加班建模表中
String syncConOverTimeSql = "insert into uf_conOvertime (resourceId, fromDate, fromTime, toDate, toTime, formmodeid, modedatacreater, modedatacreatertype, modedatacreatedate, modedatacreatetime, MODEUUID)" +
" values (?,?,?,?,?,?,?,?,?,?,?)";
String conOvertimeModeId = bb.getPropValue("project_sskj", "conOvertimeModeId");
Integer modedatacreater = 1; Integer modedatacreater = 1;
Integer modedatacreatertype = 0; Integer modedatacreatertype = 0;
String modedatacreatedate = DateUtil.format(new Date(), "yyyy-MM-dd"); String modedatacreatedate = DateUtil.format(new Date(), "yyyy-MM-dd");
String modedatacreatetime = DateUtil.format(new Date(), "HH:mm:ss"); String modedatacreatetime = DateUtil.format(new Date(), "HH:mm:ss");
String uuid = UUID.randomUUID().toString(); String uuid = UUID.randomUUID().toString();
bb.writeLog("syncConOverTimeSql：" + syncConOverTimeSql); bb.writeLog("syncConOverTimeSql：" + syncConOverTimeSql);
boolean addFlag = rs.executeUpdate(syncConOverTimeSql,requestId, resourceId, fromDate, fromTime, toDate, toTime, conOvertimeModeId, modedatacreater, modedatacreatertype, modedatacreatedate,
boolean addFlag = rs.executeUpdate(syncConOverTimeSql, resourceId, fromDate, fromTime, toDate, toTime, conOvertimeModeId, modedatacreater, modedatacreatertype, modedatacreatedate,
modedatacreatetime, uuid); modedatacreatetime, uuid);
bb.writeLog("addFlag：" + addFlag); bb.writeLog("addFlag：" + addFlag);
if (addFlag) { if (addFlag) {
@ -224,8 +218,6 @@ public class OverTimeAction implements Action {
} }
} }
}catch(Exception e) { }catch(Exception e) {
bb.writeLog("OverTimeAction Exception: " + e); bb.writeLog("OverTimeAction Exception: " + e);
return Action.FAILURE_AND_CONTINUE; return Action.FAILURE_AND_CONTINUE;

12
src/weaver/interfaces/sskj/action/OverTimeBatchAction.java
Unescape Escape View File

@ -159,8 +159,8 @@ public class OverTimeBatchAction implements Action {
if (b) { if (b) {
//将加班数据记录到连班加班建模表中 //将加班数据记录到连班加班建模表中
String syncConOverTimeSql = "insert into uf_conOvertime (resourceId, fromDate, fromTime, toDate, toTime, formmodeid, modedatacreater, modedatacreatertype, modedatacreatedate, modedatacreatetime, MODEUUID)" + String syncConOverTimeSql = "insert into uf_conOvertime (requestId,resourceId, fromDate, fromTime, toDate, toTime, formmodeid, modedatacreater, modedatacreatertype, modedatacreatedate, modedatacreatetime, MODEUUID)" +
" values (?,?,?,?,?,?,?,?,?,?,?)"; " values (?,?,?,?,?,?,?,?,?,?,?,?)";
String conOvertimeModeId = bb.getPropValue("project_sskj", "conOvertimeModeId"); String conOvertimeModeId = bb.getPropValue("project_sskj", "conOvertimeModeId");
Integer modedatacreater = 1; Integer modedatacreater = 1;
Integer modedatacreatertype = 0; Integer modedatacreatertype = 0;
@ -169,7 +169,7 @@ public class OverTimeBatchAction implements Action {
String uuid = UUID.randomUUID().toString(); String uuid = UUID.randomUUID().toString();
bb.writeLog("syncConOverTimeSql：" + syncConOverTimeSql); bb.writeLog("syncConOverTimeSql：" + syncConOverTimeSql);
boolean addFlag = rs.executeUpdate(syncConOverTimeSql, resourceId, fromDate, fromTime, toDate, toTime, conOvertimeModeId, modedatacreater, modedatacreatertype, modedatacreatedate, boolean addFlag = rs.executeUpdate(syncConOverTimeSql,requestId, resourceId, fromDate, fromTime, toDate, toTime, conOvertimeModeId, modedatacreater, modedatacreatertype, modedatacreatedate,
modedatacreatetime, uuid); modedatacreatetime, uuid);
bb.writeLog("addFlag：" + addFlag); bb.writeLog("addFlag：" + addFlag);
if (addFlag) { if (addFlag) {
@ -221,8 +221,8 @@ public class OverTimeBatchAction implements Action {
if (b) { if (b) {
//将加班数据记录到连班加班建模表中 //将加班数据记录到连班加班建模表中
String syncConOverTimeSql = "insert into uf_conOvertime (resourceId, fromDate, fromTime, toDate, toTime, formmodeid, modedatacreater, modedatacreatertype, modedatacreatedate, modedatacreatetime, MODEUUID)" + String syncConOverTimeSql = "insert into uf_conOvertime (requestId,resourceId, fromDate, fromTime, toDate, toTime, formmodeid, modedatacreater, modedatacreatertype, modedatacreatedate, modedatacreatetime, MODEUUID)" +
" values (?,?,?,?,?,?,?,?,?,?,?)"; " values (?,?,?,?,?,?,?,?,?,?,?,?)";
String conOvertimeModeId = bb.getPropValue("project_sskj", "conOvertimeModeId"); String conOvertimeModeId = bb.getPropValue("project_sskj", "conOvertimeModeId");
Integer modedatacreater = 1; Integer modedatacreater = 1;
Integer modedatacreatertype = 0; Integer modedatacreatertype = 0;
@ -231,7 +231,7 @@ public class OverTimeBatchAction implements Action {
String uuid = UUID.randomUUID().toString(); String uuid = UUID.randomUUID().toString();
bb.writeLog("syncConOverTimeSql：" + syncConOverTimeSql); bb.writeLog("syncConOverTimeSql：" + syncConOverTimeSql);
boolean addFlag = rs.executeUpdate(syncConOverTimeSql, resourceId, fromDate, fromTime, toDate, toTime, conOvertimeModeId, modedatacreater, modedatacreatertype, modedatacreatedate, boolean addFlag = rs.executeUpdate(syncConOverTimeSql,requestId, resourceId, fromDate, fromTime, toDate, toTime, conOvertimeModeId, modedatacreater, modedatacreatertype, modedatacreatedate,
modedatacreatetime, uuid); modedatacreatetime, uuid);
bb.writeLog("addFlag：" + addFlag); bb.writeLog("addFlag：" + addFlag);
if (addFlag) { if (addFlag) {

Write Preview
Loading…
Cancel
Save