2024-04-08 报工管理功能调整

src/main/java/com/baosight/hpjx/hp/sc/service/ServiceHPSC010.java

@@ -8,6 +8,7 @@ import com.baosight.hpjx.hp.sc.domain.HPSC009;
 import com.baosight.hpjx.hp.sc.domain.HPSC010;
 import com.baosight.hpjx.util.CommonMethod;
 import com.baosight.hpjx.util.ErrorCodeUtils;
+import com.baosight.hpjx.util.StringUtil;
 import com.baosight.hpjx.util.contants.ACConstants;
 import com.baosight.iplat4j.core.ei.EiBlock;
 import com.baosight.iplat4j.core.ei.EiConstant;
@@ -39,6 +40,16 @@ public class ServiceHPSC010 extends ServiceEPBase {
 
     @Override
     public EiInfo query(EiInfo inInfo) {
+        EiBlock block = inInfo.getBlock(EiConstant.queryBlock);
+        String startDate = block.getCellStr(ACConstants.ROW_CODE_0,"createdDateFrom");
+        String endDate = block.getCellStr(ACConstants.ROW_CODE_0,"createdDateTo");
+        if (!endDate.isEmpty()) {
+            inInfo.setCell(EiConstant.queryBlock,ACConstants.ROW_CODE_0,"createdDateTo", StringUtil.removeHorizontalLine(endDate));
+        }
+        if (!startDate.isEmpty()) {
+            inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0,"createdDateFrom",StringUtil.removeHorizontalLine(startDate));
+        }
+        inInfo.setCell(EiConstant.queryBlock,ACConstants.ROW_CODE_0,HPSC008.FIELD_DELETE_FLAG,CommonConstant.YesNo.NO_0);
         return super.query(inInfo,HPSC010.QUERY,new HPSC010());
     }
 

src/main/java/com/baosight/hpjx/hp/sc/sql/HPSC010.xml

@@ -73,6 +73,12 @@
 		<isNotEmpty prepend=" AND " property="userCount">
 			USER_COUNT = #userCount#
 		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="createdDateFrom">
+			REGISTER_DATE >= #createdDateFrom#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="createdDateTo">
+			REGISTER_DATE &lt;= #createdDateTo#
+		</isNotEmpty>
 	</sql>
 
 	<select id="query" parameterClass="java.util.HashMap"