xiaoning
/
gj_erp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1107文档需求2

Browse Source
master
xiezuo003 2 years ago
parent 22f1f5d338
commit f80882feee
6 changed files with 45 additions and 35 deletions
Show Stats Download Patch File Download Diff File

56
.idea/workspace.xml
Unescape View File

@ -4,23 +4,13 @@
<option name="autoReloadType" value="SELECTIVE" />
</component>
<component name="ChangeListManager">
<list default="true" id="a2c22d75-c3b6-48b6-93b4-6a3444d9a247" name="Default Changelist" comment="1019文档需求3">
<list default="true" id="a2c22d75-c3b6-48b6-93b4-6a3444d9a247" name="Default Changelist" comment="1107文档需求">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/Test.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/Test.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/bean/jcsj/EmSbrydyp.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/bean/jcsj/EmSbrydyp.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/bean/jhgk/DmZrcjh.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/bean/jhgk/DmZrcjh.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/controller/jcsj/EmGcrlController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/controller/jcsj/EmGcrlController.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/controller/jhgk/DmJtsyjhController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/controller/jhgk/DmJtsyjhController.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/controller/jhgk/DmZrcjhController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/controller/jhgk/DmZrcjhController.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/service/jcsj/EmGcrlService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/service/jcsj/EmGcrlService.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/controller/jcsj/EmSbrydypController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/controller/jcsj/EmSbrydypController.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/service/jcsj/EmSbrydypService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/service/jcsj/EmSbrydypService.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/service/jcsj/impl/EmGcrlServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/service/jcsj/impl/EmGcrlServiceImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/service/jhgk/DmJtsyjhService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/service/jhgk/DmJtsyjhService.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/service/jhgk/DmZrcjhService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/service/jhgk/DmZrcjhService.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmJtsyjhServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmJtsyjhServiceImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmXbjhServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmXbjhServiceImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/service/jcsj/impl/EmSbrydypServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/service/jcsj/impl/EmSbrydypServiceImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmZrcjhServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmZrcjhServiceImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/service/sy/SYService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/service/sy/SYService.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/resources/mappers/jhgk/DmZrcjhMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mappers/jhgk/DmZrcjhMapper.xml" afterDir="false" />
</list>
<list id="1843e6b0-3c18-45b6-89c7-e9efbe3d4674" name="Revert &quot;finish&quot;" comment="Revert &quot;finish&quot;" />
<list id="4d943a56-b745-4db0-8fd5-bbd1f49b8f76" name="Revert &quot;finish&quot;-2" comment="Revert &quot;finish&quot;&#10;&#10;This reverts commit e413da9b" />
@ -97,19 +87,6 @@
<option name="Make" enabled="true" />
</method>
</configuration>
<configuration default="true" type="ArquillianTestNG" factoryName="" nameIsGenerated="true">
<option name="arquillianRunConfiguration">
<value>
<option name="containerStateName" value="" />
</value>
</option>
<option name="TEST_OBJECT" value="CLASS" />
<properties />
<listeners />
<method v="2">
<option name="Make" enabled="true" />
</method>
</configuration>
<configuration name="GjErpApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
<module name="gj_erp" />
<option name="SPRING_BOOT_MAIN_CLASS" value="com.dsic.gj_erp.GjErpApplication" />
@ -163,7 +140,13 @@
<workItem from="1697940710591" duration="5807000" />
<workItem from="1698025517542" duration="2101000" />
<workItem from="1698135831323" duration="3744000" />
<workItem from="1699405082467" duration="9551000" />
<workItem from="1699405082467" duration="14048000" />
<workItem from="1699451901179" duration="5120000" />
<workItem from="1699495932532" duration="868000" />
<workItem from="1699500003634" duration="2747000" />
<workItem from="1699513017574" duration="285000" />
<workItem from="1699513455726" duration="1707000" />
<workItem from="1699529556581" duration="544000" />
</task>
<task id="LOCAL-00001" summary="finish">
<created>1695345779307</created>
@ -242,7 +225,14 @@
<option name="project" value="LOCAL" />
<updated>1697885046984</updated>
</task>
<option name="localTasksCounter" value="12" />
<task id="LOCAL-00012" summary="1107文档需求">
<created>1699421195438</created>
<option name="number" value="00012" />
<option name="presentableId" value="LOCAL-00012" />
<option name="project" value="LOCAL" />
<updated>1699421195438</updated>
</task>
<option name="localTasksCounter" value="13" />
<servers />
</component>
<component name="TypeScriptGeneratedFilesManager">
@ -270,7 +260,8 @@
<MESSAGE value="Revert &quot;finish&quot;&#10;&#10;test" />
<MESSAGE value="111&#10;&#10;This reverts commit f64a4dcb" />
<MESSAGE value="1019文档需求" />
<option name="LAST_COMMIT_MESSAGE" value="1019文档需求" />
<MESSAGE value="1107文档需求" />
<option name="LAST_COMMIT_MESSAGE" value="1107文档需求" />
</component>
<component name="XDebuggerManager">
<breakpoint-manager>
@ -279,6 +270,11 @@
<properties class="java.lang.StackOverflowError" package="java.lang" />
<option name="timeStamp" value="6" />
</breakpoint>
<line-breakpoint enabled="true" type="java-line">
<url>file://$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/service/jcsj/impl/EmSbjbbServiceImpl.java</url>
<line>76</line>
<option name="timeStamp" value="13" />
</line-breakpoint>
</breakpoints>
</breakpoint-manager>
<pin-to-top-manager>

3
src/main/java/com/dsic/gj_erp/controller/jcsj/EmSbrydypController.java
Unescape View File

@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONObject;
import com.dsic.gj_erp.annotation.AuthFunction;
import com.dsic.gj_erp.bean.ResultBean;
import com.dsic.gj_erp.bean.jcsj.EmSbrydyp;
import com.dsic.gj_erp.bean.request.EmSbrydypBean;
import com.dsic.gj_erp.service.jcsj.EmSbrydypService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@ -51,7 +52,7 @@ public class EmSbrydypController {
@ApiOperation(value = "批量修改")
@PostMapping(value = "/update")
public ResultBean update(@RequestBody List<EmSbrydyp> emSbrydyps) {
public ResultBean update(@RequestBody List<EmSbrydypBean> emSbrydyps) {
emSbrydypService.update(emSbrydyps);
return new ResultBean();

3
src/main/java/com/dsic/gj_erp/service/jcsj/EmSbrydypService.java
Unescape View File

@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
import com.dsic.gj_erp.bean.jcsj.EmSbcnp;
import com.dsic.gj_erp.bean.jcsj.EmSbrydyp;
import com.dsic.gj_erp.bean.jcsj.EmSbwxjh;
import com.dsic.gj_erp.bean.request.EmSbrydypBean;
import com.dsic.gj_erp.bean.request.EmSbwxjhBean;
import javax.servlet.http.HttpServletRequest;
@ -25,7 +26,7 @@ public interface EmSbrydypService extends IService<EmSbrydyp> {
void save(List<EmSbrydyp> emSbcnps, HttpServletRequest request);
void update(List<EmSbrydyp> emSbcnps);
void update(List<EmSbrydypBean> emSbcnps);
void delete(List<EmSbrydyp> emSbcnps);

5
src/main/java/com/dsic/gj_erp/service/jcsj/impl/EmGcrlServiceImpl.java
Unescape View File

@ -74,6 +74,7 @@ public class EmGcrlServiceImpl extends ServiceImpl<EmGcrlMapper, EmGcrl> impleme
LocalDate endDate = LocalDate.of(intNF, 12, 31); // 结束日期：2022年12月31日
List<EmGcrl> saveList=new ArrayList<>();
LocalDate currentDate = startDate;
while (currentDate.isBefore(endDate) || currentDate.isEqual(endDate)) {
EmGcrl emGcrl=new EmGcrl();
emGcrl.setNf(nf);
@ -85,12 +86,14 @@ public class EmGcrlServiceImpl extends ServiceImpl<EmGcrlMapper, EmGcrl> impleme
Integer weekOfMonth = currentDate.get(weekFields.weekOfMonth());
emGcrl.setYz(weekOfMonth.toString());
DayOfWeek dayOfWeek = currentDate.getDayOfWeek();
Integer dayOfYear= currentDate.getDayOfYear();
emGcrl.setGzlr(dayOfYear.toString());
Integer zj=dayOfWeek.getValue();
emGcrl.setXq(weekArray[zj-1]);
if(zj==6||zj==7){
emGcrl.setXxr("0");
}else {
emGcrl.setXh("1");
emGcrl.setXxr("1");
}
saveList.add(emGcrl);
currentDate = currentDate.plusDays(1); // 增加一天，处理下一个日期

10
src/main/java/com/dsic/gj_erp/service/jcsj/impl/EmSbrydypServiceImpl.java
Unescape View File

@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.dsic.gj_erp.bean.jcsj.EmSbrydyp;
import com.dsic.gj_erp.bean.request.EmSbrydypBean;
import com.dsic.gj_erp.dao.jcsj.EmSbrydypRepository;
import com.dsic.gj_erp.mapper.jcsj.EmSbrydypMapper;
import com.dsic.gj_erp.service.jcsj.EmSbrydypService;
@ -55,8 +56,13 @@ public class EmSbrydypServiceImpl extends ServiceImpl<EmSbrydypMapper, EmSbrydyp
}
@Override
public void update(List<EmSbrydyp> emSbcnps) {
updateBatchById(emSbcnps);
public void update(List<EmSbrydypBean> emSbcnps) {
QueryWrapper<EmSbrydyp> emSbrydypQueryWrapper=new QueryWrapper<>();
for (EmSbrydypBean emSbrydyp:emSbcnps) {
emSbrydypQueryWrapper.eq("SBBH",emSbrydyp.getSbbh());
emSbrydypQueryWrapper.eq("RYMC",emSbrydyp.getRymc());
update(emSbrydyp.getEmSbrydyp(),emSbrydypQueryWrapper);
}
}
@Override

3
src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmZrcjhServiceImpl.java
Unescape View File

@ -57,6 +57,8 @@ public class DmZrcjhServiceImpl extends ServiceImpl<DmZrcjhMapper, DmZrcjh> impl
if(StringUtils.isNotEmpty(json.getString("Zt"))){
queryWrapper.eq("zt",json.getString("Zt"));
}
queryWrapper.orderByAsc("DC_CH,cast(DC_PL as int)");
// queryWrapper.orderByAsc("DC_PL");
List<DmZrcjh> dmZrcjhs=dmZrcjhMapper.selectList(queryWrapper);
return dmZrcjhs;
}
@ -67,6 +69,7 @@ public class DmZrcjhServiceImpl extends ServiceImpl<DmZrcjhMapper, DmZrcjh> impl
List<DmZrcjh> dmZrcjhs=new ArrayList<>();
list.forEach(stringObjectMap -> {
DmZrcjh dmZrcjh = modelMapper.map(stringObjectMap, DmZrcjh.class);
dmZrcjh.setZt("0");
dmZrcjhs.add(dmZrcjh);
});
return dmZrcjhs;

Write Preview
Loading…
Cancel
Save