yuanzhi_kuang 1 week ago
parent
commit
2e8e25edbf

+ 16 - 0
src/com/kingdee/shr/compensation/app/integrate/BatchSubmitShemeBillControllerBeanEx.java

@@ -21,6 +21,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
+import org.apache.commons.codec.binary.StringUtils;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.log4j.Logger;
 
@@ -92,6 +93,16 @@ public class BatchSubmitShemeBillControllerBeanEx extends BatchSubmitShemeBillCo
 			if(null == calSubmitSchemeInfo) {
 				return;
 			}
+			String bNum = "boolean01";
+			String field = "S93";
+			CalSubmitItemCollection subColl = CalSubmitItemFactory.getLocalInstance(ctx)
+					.getCalSubmitItemCollection("SELECT ID,FieldSn,number  where  number = '"+bNum+"'");
+			if(subColl.size()>0) {
+				CalSubmitItemInfo calSubmitItemInfo = subColl.get(0);
+				int fieldSn = calSubmitItemInfo.getFieldSn();
+				field = "S"+fieldSn ;
+			}
+			
 			//提报项目字段提取,用于后面做判断;
 			Set<String> itemSet = new HashSet();
 			String subSchemeId = calSubmitSchemeInfo.getId().toString();
@@ -144,6 +155,11 @@ public class BatchSubmitShemeBillControllerBeanEx extends BatchSubmitShemeBillCo
 				if (ObjectUtils.isEmpty(valMap)) {
 					continue;
 				}
+				String remarkStr = entry.getString(field);
+				//如果点检率手工修改了,则为锁定,则不更新点检率;
+				if(StringUtils.equals(remarkStr, "是")) {
+					continue;
+				}
 				//最后这个是id
 				Object[] paraObj = new Object[itemNums.length + 1];
 				setParamsVal(itemNums, checkbillIds, entry, valMap, paraObj); 

+ 3 - 0
src/com/kingdee/shr/compensation/app/utils/SubConstants.java

@@ -15,6 +15,9 @@ public class SubConstants {
     public static final String SALARYSEQ = "MQ015";
     //MESµÄid
     public static String MESID = "MESID";
+    //Ëø¶¨±êʶ
+    public static String BOOLEANFIELD = "boolean01";
+    
     
     public static String[] ITEMNUMS = {COMRATE,JOBTYPE,SKILLLEVEL,ONSITE,TEAMAPP,SALARYSEQ};
 

+ 43 - 17
websrc/com/kingdee/shr/compensation/web/handler/timepiece/bill/TimepieceSchemeBillEditHandlerEx.java

@@ -9,16 +9,8 @@ import com.kingdee.bos.metadata.entity.FilterItemInfo;
 import com.kingdee.bos.metadata.entity.SelectorItemCollection;
 import com.kingdee.bos.metadata.entity.SelectorItemInfo;
 import com.kingdee.bos.metadata.query.util.CompareType;
-import com.kingdee.eas.common.EASBizException;
-import com.kingdee.eas.custom.calcdailypay.IInspectionRate;
-import com.kingdee.eas.custom.calcdailypay.InspectionRateCollection;
-import com.kingdee.eas.custom.calcdailypay.InspectionRateFactory;
-import com.kingdee.eas.custom.calcdailypay.InspectionRateInfo;
-import com.kingdee.eas.framework.CoreBaseCollection;
 import com.kingdee.eas.framework.CoreBaseInfo;
 import com.kingdee.eas.util.ToolUtils;
-import com.kingdee.eas.util.app.DbUtil;
-import com.kingdee.jdbc.rowset.IRowSet;
 import com.kingdee.shr.base.syssetting.context.SHRContext;
 import com.kingdee.shr.base.syssetting.exception.SHRWebException;
 import com.kingdee.shr.compensation.app.integrate.*;
@@ -26,13 +18,8 @@ import com.kingdee.shr.compensation.app.utils.DateRange;
 import com.kingdee.shr.compensation.app.utils.SubmitShemeUtils;
 import com.kingdee.shr.compensation.exception.ExceptionHandle;
 import com.kingdee.shr.base.syssetting.web.json.JSONUtils;
-import java.math.BigDecimal;
-import java.sql.SQLException;
-import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -57,6 +44,7 @@ public class TimepieceSchemeBillEditHandlerEx extends TimepieceSchemeBillEditHan
 
 	private static Logger logger = LoggerFactory.getLogger(TimepieceSchemeBillEditHandlerEx.class);
 	private static  SimpleDateFormat  SDF = new SimpleDateFormat("yyyy-MM-dd");
+
 	//完成率
 //	private static String COMRATE = "MQ005";
 //	//岗位类型
@@ -379,12 +367,50 @@ public class TimepieceSchemeBillEditHandlerEx extends TimepieceSchemeBillEditHan
 
 
 
+	/**
+	 * 获取点检率与标识字段的字段名称
+	 * @param request
+	 * @param response
+	 * @param modelMap
+	 */
+	public String getFieldRemarkAction(HttpServletRequest request, 
+			HttpServletResponse response, ModelMap modelMap) throws SHRWebException {
+
+		String checkNum = request.getParameter("checkNum");
+		String booleanNum = request.getParameter("booleanNum");
+	    List<String>  list = new ArrayList();
+		if(checkNum!= null &&!checkNum.isEmpty()){
+			list.add(checkNum);
+		}
+		if(booleanNum!= null &&!booleanNum.isEmpty()){
+			list.add(booleanNum);
+		}
+		String str = ToolUtils.aryToStr(list, true);
+		Context ctx = SHRContext.getInstance().getContext();
+			try {
+				CalSubmitItemCollection subColl = CalSubmitItemFactory.getLocalInstance(ctx)
+					.getCalSubmitItemCollection("SELECT ID,FieldSn,number  where  number in ("+str+")");
+				for(int i = 0;i<subColl.size();i++){
+					CalSubmitItemInfo calSubmitItemInfo = subColl.get(i);
+					int fieldSn = calSubmitItemInfo.getFieldSn();
+					String number = calSubmitItemInfo.getNumber();
+					String field = "S"+fieldSn ;
+				 	if(StringUtils.equals(checkNum,number)) {
+						modelMap.put("checkNum", field );
+					}else if(StringUtils.equals(booleanNum,number)){
+						modelMap.put("booleanNum", field );
+					 }
+				}
+			} catch (BOSException e) {
+				throw new RuntimeException(e);
+			}
+			JSONUtils.writeJson(response, modelMap);
+			return null;
+		}
+	}
 
 	
 
-
-
-
 //	/**
 //	 * 删除单据
 //	 */
@@ -425,4 +451,4 @@ public class TimepieceSchemeBillEditHandlerEx extends TimepieceSchemeBillEditHan
 //			throw new RuntimeException(e);
 //		}
 //	}
-}
+